From 83e3d34abd06c0256f61382c4c9cf89c4be109d8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 19 五月 2025 19:35:41 +0800
Subject: [PATCH] #问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 5f955a8..638917e 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
@@ -126,6 +126,8 @@
private DeviceSiteMapper deviceSiteMapper;
@Autowired
private ConfigService configService;
+ @Autowired
+ private CompanysService companysService;
/**
* @return
@@ -347,6 +349,12 @@
}
private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+
+ Companys companys = new Companys();
+ if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
+ companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
+ }
+
WarehouseAreasItem item = new WarehouseAreasItem();
item.setTrackCode(dto.getBarcode())
.setAreaName(areasItem.getName())
@@ -355,6 +363,7 @@
.setAsnCode(asnOrder.getCode())
.setAsnId(asnOrder.getId())
.setProdTime(dto.getProdTime())
+ .setSplrId(companys.getId())
.setWeight(dto.getWeigth())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
@@ -924,14 +933,15 @@
*/
@Override
public R getUnItemByContainer(Map<String, Object> params) {
- if (Objects.isNull(params.get("barcode"))) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ if (Cools.isEmpty(params.get("barcode")) && Cools.isEmpty(params.get("code"))){
+ 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(!Cools.isEmpty(params.get("barcode")),WaitPakin::getBarcode, params.get("barcode"))
+ .eq(!Cools.isEmpty(params.get("code")),WaitPakin::getCode, params.get("code"))
.eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
--
Gitblit v1.9.1