From e2d78583e67190d1d281400cb2a7532fc4b0023d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 08 五月 2025 11:15:36 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index cfb7657..3e08e1f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -331,10 +331,10 @@
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
- .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
- .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
- .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
- .eq(!Cools.isEmpty(item.getIsptResult()), WarehouseAreasItem::getIsptResult, item.getIsptResult())
+ .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
+ .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
+ .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
+ .eq(!Cools.isEmpty(item.getIsptResult()), WarehouseAreasItem::getIsptResult, item.getIsptResult())
.eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
@@ -453,10 +453,10 @@
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
- .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
- .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
- .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
+ .or().eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
+ .or().eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
+ .or().eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
+ .or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
return R.ok(list);
@@ -850,8 +850,33 @@
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.get("barcode").toString())
- .eq(WaitPakin::getFlagDefect, flagDefect)
+// .eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
+ if (Cools.isEmpty(waitPakin)) {
+ throw new CoolException("鎵樼洏鍙敤");
+ } else {
+ throw new CoolException("鎵樼洏涓嶅彲鐢�");
+ }
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
+ * @time 2025/4/9 16:57
+ */
+ @Override
+ public R getUnItemByContainer(Map<String, Object> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ //鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
+// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, params.get("barcode").toString())
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
return R.ok(new ArrayList<>());
}
@@ -860,25 +885,20 @@
if (pakinItems.isEmpty()) {
return R.ok(new ArrayList<>());
}
- if (!Objects.isNull(params.get("type")) && params.get("type").equals("defective")) {
- return R.ok(pakinItems);
- } else {
- List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .lambda()
- .in(WarehouseAreasItem::getTrackCode, list);
- List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
- for (int i = 0; i < warehouseAreasItems.size(); i++) {
- for (WaitPakinItem pakinItem : pakinItems) {
- if (warehouseAreasItems.get(i).getTrackCode().equals(pakinItem.getTrackCode())) {
- warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
- }
+ List<Long> list = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
+ List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
+ for (int i = 0; i < warehouseAreasItems.size(); i++) {
+ for (WaitPakinItem pakinItem : pakinItems) {
+ if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
+ warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
}
}
- return R.ok(warehouseAreasItems);
}
+ return R.ok(warehouseAreasItems);
}
+
/**
* @param
* @return
--
Gitblit v1.9.1