From 5989655fcf8c34f9091b1d328f8950dad8267725 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 22 五月 2024 14:11:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 3 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java | 6 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 5 ++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java | 2 ++
zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html | 24 ++++++++++++------------
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java | 6 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java | 6 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 2 +-
zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js | 2 +-
9 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
index 8dbc6d9..3f7a34b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
@@ -27,6 +27,12 @@
List<Integer> getAvailableOutSite(Integer typeNo, Long hostId);
/**
+ * 绌烘澘鍑哄簱绔�
+ * @return
+ */
+ List<Integer> getAvailableEmptyOutSite(Long hostId);
+
+ /**
* 鐩爣绔欑偣鐘舵�佹娴�
*
* @param pakin 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 3b57b43..dc37f85 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -230,10 +230,9 @@
LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
- .eq(LocMast::getLocType1, 1)
+ .eq(LocMast::getLocType1, locTypeDto.getLocType1())
.eq(LocMast::getCrnNo, staDesc.getDeviceNo())
- .eq(LocMast::getHostId, hostId)
- .orderByAsc(LocMast::getLev1, LocMast::getBay1, LocMast::getRow1);
+ .eq(LocMast::getHostId, hostId);
//搴撲綅鎼滅储鑼冨洿
LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
index 8bb4afd..585ec7e 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
@Service("basDevpService")
@@ -35,6 +36,11 @@
}
@Override
+ public List<Integer> getAvailableEmptyOutSite(Long hostId) {
+ return this.baseMapper.getAvailableOutSite(110, hostId);
+ }
+
+ @Override
public BasDevp checkSiteStatus(Integer devpNo, boolean pakin, Long hostId) {
BasDevp station = this.getOne(new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, devpNo).eq(BasDevp::getHostId, hostId));
if (station == null){
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index f89192e..23d3fdb 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -426,7 +426,7 @@
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
+ if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 199) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 194311c..3905711 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -57,6 +57,9 @@
if (!Cools.isEmpty(param.get("loc_no"))) {
wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
}
+ if (!Cools.isEmpty(param.get("loc_sts"))) {
+ wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
+ }
return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
index d9c02ce..014183c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
@@ -132,6 +132,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setHostId(hostId);
+ wrkMast.setCrnNo(dto.getCrnNo());
boolean res = wrkMastService.save(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -202,6 +203,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setBarcode(barcode);
+ wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
index 6bbfc44..b58e4db 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -86,6 +86,12 @@
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId(), getHostId()));
}
+ @RequestMapping("/available/empty/take/site")
+ @ManagerAuth()
+ public R availableEmptyTakeSite(){
+ return R.ok().add(basDevpService.getAvailableEmptyOutSite(getHostId()));
+ }
+
@RequestMapping("/plate/out/start")
@ManagerAuth(memo = "鍑哄簱浣滀笟")
public R fullStoreTakeStart(@RequestBody StockOutParam param) {
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
index 8bbc97c..0793482 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -37,7 +37,7 @@
tableIns = table.render({
elem: '#locMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/locMast/list/auth',
+ url: baseUrl+'/locMast/page/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
diff --git a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
index 2c65baa..dd81cf9 100644
--- a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
+++ b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
@@ -101,12 +101,12 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">淇敼鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">鍒� 寤� 鑰咃細</label>
<div class="layui-input-inline cool-auto-complete">
@@ -119,12 +119,12 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<hr class="layui-bg-gray">
--
Gitblit v1.9.1