From f0226479e92a906950aac0834048cc709e032e97 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 24 十二月 2025 09:17:44 +0800
Subject: [PATCH] 奥普瑞斯从侧面口进出，盘点拣料功能修复
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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..fd32c4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -50,6 +50,9 @@
@Value("${wms.zpalletId}")
public String WMS_ZPALLET_ID;
+ @Value("${wms.loadedPallet}")
+ public String WMS_LOADED_PALLET;
+
@Autowired
private MatService matService;
@Autowired
@@ -597,7 +600,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 +620,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());
@@ -1349,9 +1352,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 +1362,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