From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 c287493..688e1a5 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
@@ -183,15 +183,16 @@
}
/**
+ * @param params
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 鏀惰揣鑷虫敹璐у尯
- * @param params
- * @return
* @time 2025/3/10 15:41
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params) {
+ public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -234,7 +235,7 @@
}
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
- if (Objects.isNull(rcpt)) {continue;}
+ if (null == rcpt || Objects.isNull(rcpt)) {continue;}
ReceiptDetlsDto dto = JSONObject.parseObject(JSONObject.toJSONString(rcpt), ReceiptDetlsDto.class);
Matnr matnr = matnrMapper.selectById(dto.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -248,6 +249,7 @@
// }
AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, asnCode)
+ .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
.eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
@@ -299,6 +301,8 @@
.setAnfme(dto.getReceiptQty())
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setMatnrId(matnr.getId())
.setMaktx(matnr.getName())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
@@ -653,7 +657,9 @@
itemList.forEach(asnOrderItem -> {
LocItem item = new LocItem();
BeanUtils.copyProperties(asnOrderItem, item);
- item.setId(loc.getId())
+ item.setLocId(loc.getId())
+ .setId(null)
+ .setLocCode(loc.getCode())
.setOrderId(order.getId())
.setOrderItemId(asnOrderItem.getId())
.setWkType(Short.parseShort(order.getWkType()))
@@ -850,7 +856,11 @@
*/
@Override
public R getDeviceSites() {
- return R.ok(deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getStatus, 1).groupBy(DeviceSite::getSite)));
+ List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
+ .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
+ .eq(DeviceSite::getStatus, 1)
+ .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
+ return R.ok(sites);
}
/**
@@ -919,7 +929,8 @@
}
//鑾峰彇褰撳墠搴撳瓨淇℃伅
LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
- .eq(LocItem::getOrderItemId, asnOrderItem.getId())
+// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
+ .eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
.eq(LocItem::getBatch, asnOrderItem.getBatch())
.eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
//SET 褰撳墠搴撳瓨鏁伴噺
--
Gitblit v1.9.1