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/asrs/entity/param/CompleteParam.java | 2
src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java | 3
version/lib/cool-framework-install.txt | 2
src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java | 2
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 112 ++++++++++++++++++
pom.xml | 9 +
src/main/java/com/zy/api/service/WcsApiService.java | 7 +
src/main/java/com/zy/common/model/StartupDto.java | 2
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 1
src/main/java/com/zy/api/controller/WcsApiController.java | 26 +++
src/main/java/com/zy/common/constant/MesConstant.java | 6
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 104 ++++++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 39 +++---
src/main/java/com/zy/asrs/service/MobileService.java | 9 +
14 files changed, 293 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5dd2bcd..28abaa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,12 +45,17 @@
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- 浣跨敤鏈湴 JAR 瑙ｅ喅缂哄け鐨� cn.cool:framework:jar:3.2.0 -->
+<!-- <dependency>-->
+<!-- <groupId>cn.cool</groupId>-->
+<!-- <artifactId>framework</artifactId>-->
+<!-- <version>3.2.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${project.basedir}/version/lib/framework-3.2.0.jar</systemPath>-->
+<!-- </dependency>-->
<dependency>
<groupId>cn.cool</groupId>
<artifactId>framework</artifactId>
<version>3.2.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/version/lib/framework-3.2.0.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
diff --git a/src/main/java/com/zy/api/controller/WcsApiController.java b/src/main/java/com/zy/api/controller/WcsApiController.java
index 5a8d2a7..5d39339 100644
--- a/src/main/java/com/zy/api/controller/WcsApiController.java
+++ b/src/main/java/com/zy/api/controller/WcsApiController.java
@@ -82,13 +82,18 @@
return wcsApiService.combInPub(combParam, 10031L);
}
- @ManagerAuth(memo = "绉诲簱浠诲姟")
- @RequestMapping("/task/move")
- public R taskMove(@RequestBody CompleteParam combParam) {
+ /**
+ * WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
+ * @param combParam
+ * @return
+ */
+ @ManagerAuth(memo = "WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅")
+ @RequestMapping("/openapi/change/loc")
+ public R changeLoc(@RequestBody CompleteParam combParam) {
if (Objects.isNull(combParam)) {
return R.error("鍙傛暟涓嶈兘涓虹┖!!");
}
- return mobileService.taskMove(combParam, 10031L);
+ return mobileService.changeLoc(combParam, 10031L);
}
@@ -103,5 +108,18 @@
}
+ /**
+ * 閲嶆柊鍒嗛厤鍏ュ簱淇℃伅
+ */
+ @ManagerAuth
+ @ApiOperation("WCS鐢宠浠诲姟閲嶆柊鍒嗛厤鍏ュ簱")
+ @PostMapping("/openapi/reassign/loc")
+ public R repeatLocs(@RequestBody CompleteParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wcsApiService.repeatLoc(params);
+ }
+
}
diff --git a/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java b/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java
index c5349a6..ac29d72 100644
--- a/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java
+++ b/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java
@@ -13,8 +13,6 @@
@ApiModel(value = "ReceviceTaskParams", description = "绌跨嚎澧欏弬鏁�")
public class ReceviceTaskParams implements Serializable {
- @ApiModelProperty("鏈哄彴鍙�")
- private String deviceNo;
@ApiModelProperty("娴佹按鍙�")
private Integer id;
diff --git a/src/main/java/com/zy/api/service/WcsApiService.java b/src/main/java/com/zy/api/service/WcsApiService.java
index e44b2ec..ee2e423 100644
--- a/src/main/java/com/zy/api/service/WcsApiService.java
+++ b/src/main/java/com/zy/api/service/WcsApiService.java
@@ -77,4 +77,11 @@
* @return
*/
R combInPub(CompleteParam combParam, long l);
+
+ /**
+ * WCS鐢宠浠诲姟閲嶆柊鍒嗛厤鍏ュ簱
+ * @param params
+ * @return
+ */
+ R repeatLoc(CompleteParam params);
}
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index aa2ecac..34972f9 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -128,6 +128,7 @@
if (!Objects.isNull(code) && code.equals(200)) {
if (!Objects.isNull(order)) {
order.setReportOnce(5);
+ order.setSettle(6L);
orderService.updateById(order);
}
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
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("鏆傛棤鍙敤搴撲綅锛侊紒");
+ }
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CompleteParam.java b/src/main/java/com/zy/asrs/entity/param/CompleteParam.java
index 02ddf3a..ade758b 100644
--- a/src/main/java/com/zy/asrs/entity/param/CompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CompleteParam.java
@@ -22,6 +22,8 @@
//鐩爣搴撲綅
private String locNo;
+ private String taskNo;
+
//浠诲姟鍙�
private String workNo;
diff --git a/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java b/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java
index d2057aa..bb444f5 100644
--- a/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/PakinMatsByQRParams.java
@@ -14,4 +14,7 @@
@ApiModelProperty("鐗╂枡缂栫爜")
private String matnr;
+
+ @ApiModelProperty("BS Code")
+ private String threeCode;
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 8ec6f81..c1c15b4 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -176,4 +176,13 @@
* @return
*/
R taskMove(CompleteParam combParam, long l);
+
+
+ /**
+ * WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
+ * @param combParam
+ * @param l
+ * @return
+ */
+ R changeLoc(CompleteParam combParam, long l);
}
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 eb258b4..69711a7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -17,6 +17,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.asrs.utils.Utils;
import com.zy.common.constant.HIKApiConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -25,6 +26,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -86,6 +88,9 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+
+ @Autowired
+ private SlaveProperties slaveProperties;
@Autowired
private AdjDetlService adjDetlService;
@@ -1316,6 +1321,7 @@
throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
}
List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
+ .eq(!Cools.isEmpty(params.getThreeCode()), "three_code", params.getThreeCode())
.eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())
.eq("order_id", orderPakin.getId()));
if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
@@ -1768,7 +1774,7 @@
throw new CoolException("绔欑偣涓嶈兘涓虹┖!!");
}
if (Objects.isNull(param.getLocType1())) {
- param.setLocType1((short)1);
+ param.setLocType1((short) 1);
}
@@ -1783,7 +1789,7 @@
List<WaitPakin> waitPakins = waitPakinService
.selectList(new EntityWrapper<WaitPakin>()
- .eq("io_status" , "N")
+ .eq("io_status", "N")
.eq("zpallet", param.getBarcode()));
if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
@@ -2003,7 +2009,7 @@
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");
- wrkMast.setStaNo(dto.getStaNo() + "");
+ wrkMast.setStaNo(!Objects.isNull(dto.getStaNo()) ? dto.getStaNo() + "" : null);
wrkMast.setLocNo(dto.getLocNo());
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setBarcode(pakin.getZpallet()); // 鎵樼洏鐮�
@@ -2580,6 +2586,7 @@
/**
* 绉诲簱浠诲姟鐢宠
+ *
* @param combParam
* @param userId
* @return
@@ -2642,6 +2649,97 @@
}
/**
+ * 6.15WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
+ * @param combParam
+ * @param l
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R changeLoc(CompleteParam combParam, long l) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ if (Objects.isNull(combParam.getLocNo())) {
+ return R.error("搴撲綅鍙蜂笉鑳戒负绌�!!");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
+ if (Objects.isNull(locMast)) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦ㄦ垨搴撲綅鐘舵�侀潪 F.鍦ㄥ簱 鐘舵��");
+ }
+
+ List<Integer> doubleLocs = slaveProperties.getDoubleLocs();
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .in("row1", doubleLocs)
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
+ Map<String, Object> result = new HashMap<>();
+ LocMast selected = new LocMast();
+ for (LocMast loc : locMasts) {
+ LocMast temLoc = locMastService.selectById(loc.getLocNo());
+ if (Objects.isNull(temLoc)) {
+ throw new CoolException("鏁版嵁閿欒锛� 鍘熷簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ }
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, temLoc.getLocNo());
+
+ LocMast locMast1 = locMastService.selectById(shallowLoc);
+ if (Objects.isNull(locMast1)) {
+ throw new CoolException("鏁版嵁閿欒锛� 鏂板簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ }
+ if (!locMast1.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ continue;
+ }
+ selected = loc;
+
+ break;
+ }
+
+ WrkMast moveTask = generateMoveTask(selected, locMast);
+ result.put("locNo", selected.getLocNo());
+ result.put("taskNo", moveTask.getWrkNo());
+
+ return R.ok().add(result);
+
+ }
+
+ /**
+ * 鐢熸垚绉诲簱浠诲姟
+ *
+ * @param result
+ * @param sourceLoc
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public WrkMast generateMoveTask(LocMast result, LocMast sourceLoc) {
+ WrkMast wrkMast = new WrkMast();
+ int workNo = commonService.getWorkNo(0);
+
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setLocNo(result.getLocNo());
+ wrkMast.setSourceLocNo(sourceLoc.getLocNo());
+ wrkMast.setWrkSts(11L);
+ wrkMast.setIoType(11);
+ wrkMast.setCrnNo(sourceLoc.getCrnNo());
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ wrkMast.setIoPri(13D);
+ wrkMast.setWrkDate(new Date());
+
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLoc.getLocNo()));
+ locDetls.forEach(detl -> {
+ detl.setLocNo(result.getLocNo());
+ if (!locDetlService.updateById(detl)) {
+ throw new CoolException("鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+ });
+
+ return wrkMast;
+ }
+
+ /**
* 鎸変紭鍏堢骇鏌ユ壘鍙敤搴撲綅
* 椤哄簭锛氬叆搴撶紦瀛樺尯 -> SO鍖� -> EO鍖�
*/
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index 7c46dda..e4470ed 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -6,7 +6,8 @@
public class MesConstant {
//灏忕郴缁熸帴鍙ｅ湴鍧�
- public static final String URL = "http://webservice.kopen.com.cn:1482/kc-api/api/wms/ ";
+// public static final String URL = "http://webservice.kopen.com.cn:1482/kc-api/api/wms/ ";
+ public static final String URL = "http://10.143.23.26:1482/kc-api/api/wms/ ";
//WCS绯荤粺鎺ュ彛鍦板潃
public static final String WCS_URL = "http://192.168.238.244:9090/wcs";
@@ -21,6 +22,9 @@
/**绉诲簱鐢宠閾炬帴浠诲姟**/
public static final String MOVE_LOC_TASK = "/openapi/createLocMoveTask";
+
+ /****/
+ public static final String LOC_F_MOV = "/openapi/change/loc";
/***鐢宠鍏ュ簱浠诲姟*/
public static final String PUB_TASK_IN = "/openapi/createInTask";
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index b0ecc3e..3c9f3d1 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -18,4 +18,6 @@
private Integer workNo;
+
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8f8280f..305a037 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -133,23 +133,25 @@
/**
* 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
*/
- switch (rowLastnoType.getType()) {
- case 1:
- return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
- case 2:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
- break;
- case 3:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
- break;
- case 4:
- return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
- case 5:
- return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
- default:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
- break;
- }
+ return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+
+// switch (rowLastnoType.getType()) {
+// case 1:
+// return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+//// case 2:
+//// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+//// break;
+//// case 3:
+//// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+//// break;
+//// case 4:
+//// return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
+//// case 5:
+//// return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+//// default:
+//// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+//// break;
+// }
} catch (Exception e) {
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
@@ -182,8 +184,9 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
}
StartupDto startupDto = new StartupDto();
+ //TODO 闇�瑕佸尯鍒�207锛�217锛� 239绔欑偣锛屾护鑺拰涓欢闇�瑕佸尯鍒嗗紑
locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .ne("row1", rowLastno.getsRow())
+ .ge("row1", rowLastno.getsRow())
.le("row1", rowLastno.geteRow())
.eq("loc_sts", "O")
.orderAsc(Arrays.asList("row1", "bay1", "lev1")));
diff --git a/version/lib/cool-framework-install.txt b/version/lib/cool-framework-install.txt
index b571c1d..556b8b7 100644
--- a/version/lib/cool-framework-install.txt
+++ b/version/lib/cool-framework-install.txt
@@ -1 +1 @@
-mvn install:install-file -Dfile=framework-3.2.0.jar -DgroupId=cn.cool -DartifactId=framework -Dversion=3.2.0 -Dpackaging=jar -DgeneratePom=true
+mvn install:install-file '-Dfile=version/lib/framework-3.2.0.jar' '-DgroupId=cn.cool' '-DartifactId=framework' '-Dversion=3.2.0' '-Dpackaging=jar' '-DgeneratePom=true'
\ No newline at end of file
--
Gitblit v1.9.1