From fa41057432882ae94ea4edf816f4f76f1d6fd4ba Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 19 四月 2025 10:41:03 +0800
Subject: [PATCH] SRM增加log日志
---
src/main/java/com/gs/xky/service/Impl/DeliveryNoticeServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gs/xky/service/Impl/DeliveryNoticeServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/DeliveryNoticeServiceImpl.java
index 86b8cea..22fd36d 100644
--- a/src/main/java/com/gs/xky/service/Impl/DeliveryNoticeServiceImpl.java
+++ b/src/main/java/com/gs/xky/service/Impl/DeliveryNoticeServiceImpl.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author 28567
@@ -41,13 +42,19 @@
wrapper.eq(DeliveryNotice::getDeliveryNo, xkyDetail.getDeliveryNo());
- long count = count(wrapper);
+// long count = count(wrapper);
+ DeliveryNotice one = getOne(wrapper, false);
- if (count > 0) {
+ if (one != null) {
LambdaUpdateWrapper<DeliveryNotice> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(DeliveryNotice::getDeliveryNo, xkyDetail.getDeliveryNo());
remove(updateWrapper);
+
+ LambdaUpdateWrapper<DeliveryNoticeDetail> updateWrapper1 = new LambdaUpdateWrapper<>();
+ updateWrapper1.eq(DeliveryNoticeDetail::getPid, one.getId());
+ detailService.remove(updateWrapper1);
}
+
DeliveryNotice deliveryNotice = new DeliveryNotice();
BeanUtil.copyProperties(xkyDetail, deliveryNotice);
@@ -62,7 +69,9 @@
}
List<DeliveryNoticeDetail> noticeDetails = new ArrayList<>();
- for (LineList list : lineList) {
+
+ List<LineList> collect = lineList.stream().filter(s -> "1".equals(s.getStatus())).collect(Collectors.toList());
+ for (LineList list : collect) {
DeliveryNoticeDetail detail = new DeliveryNoticeDetail();
BeanUtil.copyProperties(list, detail);
detail.setPid(id);
@@ -70,13 +79,19 @@
if (StrUtil.isNotEmpty(detail.getPoLineNo())) {
String[] split = detail.getPoLineNo().split("-");
detail.setPoLineNo(split[0]);
+ detail.setPlanLineNo(split[1] + "-" + detail.getDeliveryQty());
}
-
+
noticeDetails.add(detail);
}
return save(deliveryNotice) && detailService.saveBatch(noticeDetails);
}
+
+ @Override
+ public void callPdaReceiptBtn(String inStr, String result) {
+ baseMapper.callPdaReceiptBtn(inStr, result);
+ }
}
--
Gitblit v1.9.3