From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 441 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 387 insertions(+), 54 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 ede488a..3b3fc44 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -3,30 +3,33 @@
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.R;
import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
-import com.zy.asrs.entity.BasDevice;
-import com.zy.asrs.entity.LocAroundBind;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDeviceService;
-import com.zy.asrs.service.LocAroundBindService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
+import com.zy.common.service.CommonService;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+@Slf4j
@Service
public class WcsApiServiceImpl implements WcsApiService {
@@ -38,20 +41,42 @@
private LocMastService locMastService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Value("${wcs.address.URL}")
+ private String wcs_address;
+
+ @Value("${wcs.address.createOutTask}")
+ private String getWcs_address;
+
+ @Value("${wcs.address.createInTask}")
+ private String createInTask;
+
+ @Value("${wcs.address.createLocMoveTask}")
+ private String createLocMoveTask;
+ @Autowired
+ private CommonService commonService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
- * @author Ryan
- * @date 2026/1/10 11:18
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 11:18
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R lockLocs(ReceviceTaskParams params) {
BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
.eq("status", 1)
- .eq("dev_no", params.getDeviceNo()));
+ .eq("dev_no", params.getDevNo()));
if (Objects.isNull(basDevice)) {
throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
}
@@ -59,7 +84,7 @@
if (Objects.isNull(binds) || binds.isEmpty()) {
throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
}
- Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+ Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
reportLockLocs(locs, "lock");
@@ -68,44 +93,48 @@
/**
* 浣欐枡鍥炲簱 锛堟惉杩愪綑鏂欏洖搴擄級
- * @author Ryan
- * @date 2026/1/10 13:19
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 13:19
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R backLocs(WorkTaskParams params) {
- if (Objects.isNull(params.getTaskNo())) {
- throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒锛�");
+ public R backLocs(String params) {
+// if (Objects.isNull(params.getWrkNo())) {
+// throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒锛�");
+// }
+// String wrkCode = params.getTaskNo();
+// if (wrkCode.contains("-1")) {
+// throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
+// }
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", params));
+ if (Objects.isNull(mast)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
}
- String wrkCode = params.getTaskNo();
- if (wrkCode.contains("-1")) {
- throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
- }
+// if (!mast.getWrkSts().equals(103L)) {
+// throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
+// }
+// if (params.getIsSuplus() == 1) {
+// mast.setIsSuplus(1);
+// }
+//
+// if (!wrkMastService.updateById(mast)) {
+// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+ workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
- WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_code", params.getTaskNo()));
-
- if (Objects.isNull(mast)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
- }
- if (!mast.getWrkSts().equals(103L)) {
- throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
- }
- mast.setWrkSts(53L);
- if (!wrkMastService.updateById(mast)) {
- throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
-
- return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
+ return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
}
/**
* 涓嬪彂浠诲姟鑷砏CS
- * @author Ryan
- * @date 2026/1/10 13:58
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 13:58
*/
@Override
public R pubWrkToWcs(WorkTaskParams params) {
@@ -118,35 +147,107 @@
if (Objects.isNull(params.getLocNo())) {
return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
}
- String url = MesConstant.PUB_TASK_IN;
- if (Objects.isNull(params.getType()) && params.getType().equals("out")) {
- url = MesConstant.PUB_TASK_OUT;
+ String url = createInTask;
+ if (!Objects.isNull(params.getType()) && params.getType().equals("out")) {
+ url = getWcs_address;
+ }else if (!Objects.isNull(params.getType()) && params.getType().equals("move")) {
+ url = createLocMoveTask;
}
String response;
+ R r = R.ok();
try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
+ log.info("涓嬪彂鎼繍浠诲姟缁檞cs="+JSON.toJSONString(params));
+ response = new HttpHandler.Builder()
+ .setUri(wcs_address)
.setPath(url)
.setJson(JSON.toJSONString(params))
.build()
.doPost();
- R result = JSON.parseObject(response, R.class);
+ JSONObject jsonObject = JSON.parseObject(response);
+ log.info("涓嬪彂浠诲姟缁檞cs鐨勮繑鍥炲��="+response);
+ Integer code = jsonObject.getInteger("code");
- if (result.get("code").equals("200")) {
+ if (code==200) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
+ if (!Objects.isNull(wrkMast)) {
+ if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10) {
+ wrkMast.setWrkSts(2L);
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }else if(wrkMast.getIoType()==2){
+ wrkMast.setWrkSts(2L);
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ String s = Utils.convertLocFormat(params.getLocNo());
+ LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
+ .eq("b_loc_no", s));
+ if (!Objects.isNull(bind)) {
+ bind.setFreeze(1);
+ locAroundBindService.updateById(bind);
+ //鍐荤粨鐩搁偦搴撲綅
+ Integer[] aroundIds = freezeLocAround(bind.getOrderNo());
+ if (aroundIds != null) {
+ for (Integer id : aroundIds) {
+ if (id != null && id > 0) {
+ LocAroundBind aroundBind = locAroundBindService.selectOne(
+ new EntityWrapper<LocAroundBind>()
+ .eq("dev_id", bind.getDevId())
+ .eq("order_no", id));
+ if (aroundBind != null) {
+ aroundBind.setFreeze(1);
+ locAroundBindService.updateById(aroundBind);
+ }
+ }
+ }
+ }
+ }
+ }else if (wrkMast.getIoType()==101){
+ wrkMast.setWrkSts(12L);
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ //鍑哄簱涓烘満鍙板伐浣嶆椂锛屽喕缁撶浉瀵规湁鐨勫簱浣�,鍙婄浉閭诲簱浣�
+ String s = Utils.convertLocFormat(params.getLocNo());
+ LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
+ .eq("b_loc_no", s));
+ if (!Objects.isNull(bind)&&Cools.isEmpty(wrkMast.getStaNo())) {
+ bind.setFreeze(1);
+ locAroundBindService.updateById(bind);
+ //鍐荤粨鐩搁偦搴撲綅
+ Integer[] aroundIds = freezeLocAround(bind.getOrderNo());
+ if (aroundIds != null) {
+ for (Integer id : aroundIds) {
+ if (id != null && id > 0) {
+ LocAroundBind aroundBind = locAroundBindService.selectOne(
+ new EntityWrapper<LocAroundBind>()
+ .eq("dev_id", bind.getDevId())
+ .eq("order_no", id));
+ if (aroundBind != null) {
+ aroundBind.setFreeze(1);
+ locAroundBindService.updateById(aroundBind);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
//TODO 涓婃姤鏄惁鎴愬姛
+ }else {
+ r =R.error();
}
} catch (IOException e) {
throw new RuntimeException(e);
}
- return null;
+ return r;
}
/**
* 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
+ *
+ * @param locs
* @author Ryan
* @date 2026/1/10 12:50
- * @param locs
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -159,20 +260,252 @@
}
String response;
try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(url)
- .setJson(JSON.toJSONString(locs))
- .build()
- .doPost();
- R result = JSON.parseObject(response, R.class);
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(url)
+ .setJson(JSON.toJSONString(locs))
+ .build()
+ .doPost();
+ R result = JSON.parseObject(response, R.class);
- if (result.get("code").equals("200")) {
+ if (result.get("code").equals("200")) {
//TODO 涓婃姤鏄惁鎴愬姛
- }
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}
}
+
+ /**
+ * 鍫嗗灈鏈烘墽琛岀姸鎬佷笂鎶�
+ *
+ * @param params
+ * @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 16:30
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R receviceTaskFromWcs(ReceviceTaskParams params) {
+ log.info("wcs浠诲姟鍙嶉="+JSON.toJSONString(params));
+ 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.getSuperTaskNo()));
+ if (Objects.isNull(mast)) {
+ throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
+ }
+
+
+ if (params.getNotifyType().equals("task")) {
+ //浠诲姟
+ if (params.getMsgType().equals("task_complete")) {
+ //绉伴噸
+ if ((mast.getIoType()==1||mast.getIoType()==10)&&mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
+ Double weight = 0.0;
+ if (!Cools.isEmpty(params.getData())){
+ JSONObject jsonObject = JSONObject.parseObject(params.getData());
+ weight=jsonObject.getDouble("weight");
+ }
+ if (mast.getIoType() == 10) {
+ //绌烘澘鍏ュ簱浠诲姟妗�
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("zpallet", mast.getBarcode())
+ .eq("loc_no", mast.getSourceLocNo()));
+ if (Objects.isNull(locDetl)) {
+ throw new CoolException("鏄庣粏鏁版嵁涓嶅瓨鍦紒锛�");
+ }
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", locDetl.getMatnr()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ if (!Cools.isEmpty(weight)) {
+ Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
+ if (val.compareTo(0.0) > 0) {
+ WrkDetl wrkDetl = new WrkDetl();
+ BeanUtils.copyProperties(locDetl, wrkDetl);
+ wrkDetl.setWrkNo(mast.getWrkNo());
+ wrkDetl.setStockQty(locDetl.getAnfme());
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setWeight(weight);
+ wrkDetl.setIoTime(mast.getIoTime());
+ //浣欐枡闀垮害
+ wrkDetl.setAnfme(val * matnr.getVolume());
+ if (!wrkDetlService.insert(wrkDetl)){
+ throw new CoolException("鏃犳硶鏂板鏄庣粏锛侊紒");
+ }
+ mast.setIoType(1);
+ mast.setIsSuplus(1);
+ mast.setOveMk("Y");
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+ // 鏇存柊鍘熷嚭搴撳崟
+
+ if (!Cools.isEmpty(mast.getWrkCode())) {
+ String wrkNo = mast.getWrkCode();
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+ WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(detl)) {
+ throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+// //搴撳瓨鍑忓幓绉伴噸闀垮害
+// Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
+// //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
+// detl.setAnfme(v);
+// detl.setWeight(weight);
+ if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
+ throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ } else {
+ throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
+ }
+ }
+ }
+ } else {
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
+ if (Objects.isNull(wrkDetl)) {
+ throw new CoolException("鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", wrkDetl.getMatnr()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
+ if (!Cools.isEmpty(weight)) {
+ Double val = Math.round((weight - 2.35) * 10000) / 10000.0;
+ //绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
+ realQty = val * matnr.getVolume();
+ if (realQty<matnr.getSafeQty()){
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkDetl.getWrkNo()));
+ mast.setIoType(10);
+ mast.setEmptyMk("Y");
+ }else{
+ wrkDetl.setAnfme(realQty);
+ wrkDetl.setWeight(weight);
+ if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
+ throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ }
+
+
+ mast.setOveMk("Y");
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+
+ // 鏇存柊鍘熷嚭搴撳崟
+// int indexOf = mast.getWrkCode().indexOf("-1");
+ if (!Cools.isEmpty(mast.getWrkCode())) {
+ String wrkNo = mast.getWrkCode();
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+ WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(detl)) {
+ throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ //搴撳瓨鍑忓幓绉伴噸闀垮害
+ Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
+ //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
+ detl.setAnfme(v);
+ detl.setWeight(weight);
+ if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
+ throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ } else {
+ throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
+ }
+ }
+ }
+
+ if (!Objects.isNull(mast.getWrkCode())) {
+ if (mast.getOveMk().equals("N") && !Cools.isEmpty(mast.getIsSuplus())) {
+ throw new CoolException("浠诲姟鏈笂鎶ラ噸閲忥紝鏃犳硶瀹岀粨浠诲姟锛侊紒");
+ }
+ }
+ if (mast.getIoType() == 1 || mast.getIoType() == 2 ||mast.getIoType() == 10) {
+ mast.setWrkSts(4L);
+ } else if ((mast.getIoType() == 101||mast.getIoType()==110) && mast.getWrkSts()<14) {
+ mast.setWrkSts(14L);
+ if(Cools.isEmpty(mast.getStaNo())){
+ mast.setOveMk("Y");
+ }
+ }
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else if (params.getMsgType().equals("task_cancel")) {
+ //todo 鍙栨秷浠诲姟
+ }else if (params.getMsgType().equals("task_arrive")) {
+ //鍒拌揪鐩殑鍦�
+ //濡傛灉鍑哄簱浠诲姟鏄法鍖哄垯闇�瑕佺敓鎴愭柊鐨勫叆搴撲换鍔″叆搴�
+ if(!Cools.isEmpty(mast.getLocNo())){
+ mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
+ }
+ mast.setWrkSts(14L);
+ if(Cools.isEmpty(mast.getStaNo())){
+ mast.setOveMk("Y");
+ }
+ mast.setModiTime(new Date());
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ } else if (params.getNotifyType().equals("weight")) {
+
+ }
+ return R.ok();
+ }
+ //杈撳叆搴撲綅鑷姩鍐荤粨绠楀嚭鐩搁偦搴撲綅搴忓彿
+ @Override
+ public Integer[] freezeLocAround(Integer locId) {
+ Integer[] locAround = new Integer[3];
+ if (Objects.isNull(locId)) {
+ throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒");
+ }else if (locId==1){
+ locAround[0] = 2;
+ locAround[1] = 3;
+ locAround[2] = 5;
+ }else if (locId==2){
+ locAround[0] = 1;
+ locAround[1] = 6;
+ locAround[2] = 0;
+ }else if (locId==3){
+ locAround[0] = 1;
+ locAround[1] = 4;
+ locAround[2] = 0;
+ }else if (locId==4){
+ locAround[0] = 5;
+ locAround[1] = 3;
+ locAround[2] = 0;
+ }else if (locId==5){
+ locAround[0] = 4;
+ locAround[1] = 1;
+ locAround[2] = 6;
+ }else if (locId==6){
+ locAround[0] = 2;
+ locAround[1] = 5;
+ locAround[2] = 0;
+ }
+ return locAround;
+ }
}
--
Gitblit v1.9.1