From ca23f2be97249ab82494983ee34636dcc28c8a19 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 10:13:52 +0800
Subject: [PATCH] 报检提示优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 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 098d817..b385eed 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
@@ -1,14 +1,16 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
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.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
@@ -16,11 +18,11 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -42,10 +44,8 @@
private ReportMsgService reportMsgService;
@Resource
private PurchaseMapper purchaseMapper;
-
@Autowired
private AsnOrderItemService asnOrderItemService;
-
@Resource
private SerialRuleMapper serialRuleMapper;
@@ -59,28 +59,14 @@
throw new CoolException("ASN鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
List<PoItemsDto> items = purchaseMapper.poList(asnIds);
+ if (items.isEmpty()) {
+ throw new CoolException("鐗╂枡鎵�灞為噰璐崟鎹笉瀛樺湪锛侊紒");
+ }
if (reportMsgService.reportInspectNotify(items)) {
return true;
} else {
return false;
}
- }
-
- @Override
- public R generateBarcode(List<AsnOrder> orders) {
- orders.forEach(order -> {
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- if (!items.isEmpty()) {
- items.forEach(item -> {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
- item.setTrackCode(ruleCode);
- });
- if (!asnOrderItemService.saveOrUpdateBatch(items)) {
- throw new CoolException("鐢熸垚鏉＄爜澶辫触锛侊紒");
- }
- }
- });
- return R.ok();
}
@Override
@@ -91,7 +77,6 @@
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
.like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))
.eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));
-
if (orderItems.isEmpty()) {
return new ArrayList<>();
}
@@ -101,17 +86,21 @@
}
@Override
- public R saveOrderAndItems(AsnOrderAndItemsParams params) {
+ public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) {
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
AsnOrder orders = params.getOrders();
-
+ if (Objects.isNull(orders)) {
+ throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders);
if (Objects.isNull(ruleCode)) {
throw new CoolException("鏀惰揣閫氱煡鍗曠紪鐮佺敓鎴愬け璐ワ紒锛�");
}
- orders.setCode(ruleCode);
+ orders.setCode(ruleCode)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId);
if (!this.save(orders)) {
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
}
@@ -122,12 +111,66 @@
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
item.put("poCode", orders.getPoCode());
-
+ item.put("createBy", loginUserId);
+ item.put("updateBy", loginUserId);
if (!asnOrderItemService.fieldsSave(item)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
-
});
return R.ok("淇濆瓨鎴愬姛!!");
}
+
+ /**
+ * 琛ㄥ崟鏄庣粏淇敼
+ *
+ * @param params
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Transactional
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
+ if (Objects.isNull(params.getOrders())) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrders().getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!this.updateById(params.getOrders())) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
+ List<Map<String, Object>> items = params.getItems();
+ List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
+ if (!asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
+
+ /**
+ * @author Ryan
+ * @description 鎵归噺淇敼
+ * @param
+ * @return
+ * @time 2025/4/1 07:58
+ */
+ @Override
+ public boolean batchUpdate(BatchUpdateParam params, Long userId) {
+ AsnOrder 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));
+
+ }
}
--
Gitblit v1.9.1