From 78b8f5141aa11bfa0f94361407ed43362c8852ce Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 17:28:55 +0800
Subject: [PATCH] WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
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 174cbdd..31f4da3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
@@ -49,6 +50,9 @@
@Value("${wms.zpalletId}")
public String WMS_ZPALLET_ID;
+
+ @Value("${wms.loadedPallet}")
+ public String WMS_LOADED_PALLET;
@Autowired
private MatService matService;
@@ -597,7 +601,7 @@
Date now = new Date();
// 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
@@ -617,9 +621,9 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
- }
+// if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
+// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+// }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setBatch(detlDto.getBatch());
@@ -1289,7 +1293,7 @@
@Transactional
public R callEmptyBinOutBound(MesOutApply mesOutApply, String staNo, String locType,int count, Long userId) {
List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().setSqlSelect("TOP " + count + " *")
- .eq("loc_sts", "D").eq("frozen", 0).eq("loc_type2", locType).orderBy("lev1").orderBy("bay1").orderBy("row1"));
+ .eq("loc_sts", "D").eq("frozen", 0).like("barcode", locType, SqlLike.RIGHT).orderBy("lev1").orderBy("bay1").orderBy("row1"));
if (locMastList.size() < count) {
return R.parse("绌烘墭鏁伴噺涓嶈冻(鎴栧喕缁�)锛屽墿浣欐暟閲忥細" + locMastList.size());
}
@@ -1297,7 +1301,7 @@
// 鑾峰彇璺緞
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", 110)
- .eq("stn_no", 204)
+ .eq("stn_no", staNo.startsWith("B") ? 204 : staNo)
.eq("crn_no", 1);
StaDesc staDesc = staDescService.selectOne(wrapper);
if (staDesc == null) {
@@ -1326,6 +1330,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
+ wrkMast.setBarcode(locMast.getBarcode());
if (mesOutApply != null) {
wrkMast.setTaskNo(mesOutApply.getTaskno());
wrkMast.setAgvSta(mesOutApply.getStationId());
@@ -1349,9 +1354,9 @@
}
@Override
- public R callEmptyBinInBound(String site, Long userId) {
+ public R callEmptyBinInBound(String site, String barcode, String emptyFlag, Long userId) {
TransTask transTask = new TransTask();
-// transTask.setTaskno(mesInApply.getTaskno());
+ transTask.setTaskno(String.valueOf(new Date().getTime()));
// transTask.setTaskname(mesInApply.getTaskname());
// transTask.setOrderNo(mesInApply.getOrderNo());
transTask.setTransType("02"); // 涓嬫瘺鍧�
@@ -1359,10 +1364,18 @@
transTask.setCurStationId(site);
transTask.setNextStationId(WMS_TRANS_START_STATION_2);
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
+ if ("1".equals(emptyFlag)) { // 鍒ゆ柇鏄惁缁勬墭
+ int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if(count <= 0) {
+ return R.parse("鏈粍鎵橈細" + barcode);
+ }
+ transTask.setItemno(WMS_LOADED_PALLET); // 鍥哄畾涓烘弧鎵樼殑缂栫爜
+ }
transTask.setQty(1); // 绌烘墭鍙洖1涓�
// transTask.setProductLineId(mesInApply.getProductLineId());
transTask.setOperateType(1);
transTask.setAgvFactory(1);
+ transTask.setTuoPanId(barcode);
JSONObject sendAgvTask = mesService.submitTask(transTask);
if ("1".equals(sendAgvTask.getString("Success"))) {
log.info("pda鍛煎彨鏂欐鍥炲簱鎴愬姛,{}", JSONObject.toJSONString(transTask));
--
Gitblit v1.9.1