From ffa9b04fbb25726c77458da5607c1b43bdd62603 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:25:46 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 576f97b..8096cb2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -9,7 +9,6 @@
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.api.service.ReportMsgService;
-import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.*;
@@ -39,7 +38,7 @@
* @time 2025/3/7 08:02
*/
@Service("asnOrderService")
-public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements AsnOrderService {
+public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements AsnOrderService {
@Autowired
private ReceiveMsgService receiveMsgService;
@@ -62,11 +61,11 @@
private PurchaseItemService purchaseItemService;
@Override
- public boolean notifyInspect(List<AsnOrder> orders) {
+ public boolean notifyInspect(List<WkOrder> orders) {
if (orders.isEmpty()) {
throw new CoolException("涓婃姤鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- Set<Long> asnIds = orders.stream().map(AsnOrder::getId).collect(Collectors.toSet());
+ Set<Long> asnIds = orders.stream().map(WkOrder::getId).collect(Collectors.toSet());
if (asnIds.isEmpty()) {
throw new CoolException("ASN鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
@@ -82,7 +81,7 @@
}
@Override
- public List<AsnOrder> getListByMatnr(Map<String, String> params) {
+ public List<WkOrder> getListByMatnr(Map<String, String> params) {
if (Objects.isNull(params)) {
throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
@@ -103,7 +102,7 @@
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
@@ -137,7 +136,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
@@ -165,7 +164,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
@@ -194,18 +193,18 @@
*/
@Override
public boolean batchUpdate(BatchUpdateParam params, Long userId) {
- AsnOrder order = params.getOrder();
+ WkOrder order = params.getOrder();
if (Objects.isNull(order)) {
throw new CoolException("淇敼鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return this.update(new LambdaUpdateWrapper<AsnOrder>()
- .in(AsnOrder::getId, params.getIds())
- .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
- .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
- .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus())
- .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
- .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
- .set(AsnOrder::getUpdateBy, userId));
+ return this.update(new LambdaUpdateWrapper<WkOrder>()
+ .in(WkOrder::getId, params.getIds())
+ .set(!Objects.isNull(order.getRleStatus()), WkOrder::getRleStatus, order.getRleStatus())
+ .set(!Objects.isNull(order.getNtyStatus()), WkOrder::getNtyStatus, order.getNtyStatus())
+ .set(!Objects.isNull(order.getStatus()), WkOrder::getStatus, order.getStatus())
+ .set(!Objects.isNull(order.getWkType()), WkOrder::getWkType, order.getWkType())
+ .set(!Objects.isNull(order.getExceStatus()), WkOrder::getExceStatus, order.getExceStatus())
+ .set(WkOrder::getUpdateBy, userId));
}
/**
@@ -219,13 +218,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R completeOrder(Long id, Long loginUserId) {
- AsnOrder asnOrder = this.getById(id);
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = this.getById(id);
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦�!!");
}
//涓�閿姞鍏ュ巻鍙叉。
try {
- operateOrderLogs(asnOrder);
+ operateOrderLogs(wkOrder);
} catch (Exception e) {
throw new CoolException("鏀惰揣瀹屾垚澶辫触锛侊紒");
}
@@ -235,7 +234,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R closeOrder(Long id) {
- AsnOrder order = this.getById(id);
+ WkOrder order = this.getById(id);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -265,7 +264,7 @@
if (Objects.isNull(purchase)) {
throw new CoolException("PO鍗曟嵁涓嶅瓨鍦紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
//鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
order.setCode(code)
@@ -387,9 +386,9 @@
}
}
- if (!this.remove(new LambdaQueryWrapper<AsnOrder>()
- .in(AsnOrder::getId, ids)
- .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>()
+ .in(WkOrder::getId, ids)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
}
@@ -410,7 +409,7 @@
* @time 2025/3/19 19:53
*/
@Transactional(rollbackFor = Exception.class)
- public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception {
+ public synchronized void operateOrderLogs(WkOrder asrder) throws Exception {
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -426,7 +425,7 @@
// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
// }
- AsnOrder order = this.getById(asrder.getId());
+ WkOrder order = this.getById(asrder.getId());
AsnOrderLog orderLog = new AsnOrderLog();
// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
BeanUtils.copyProperties(order, orderLog);
--
Gitblit v1.9.1