From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 351 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 287 insertions(+), 64 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 741bcda..4508bcd 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,6 +1,7 @@
package com.vincent.rsf.server.manager.service.impl;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.R;
@@ -8,19 +9,16 @@
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.dto.DashboardDto;
+import com.vincent.rsf.server.manager.controller.dto.StockTrandDto;
+import com.vincent.rsf.server.manager.controller.dto.StockTransItemDto;
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.entity.AsnOrderItemLog;
-import com.vincent.rsf.server.manager.entity.AsnOrderLog;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
-import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
-import com.vincent.rsf.server.manager.service.AsnOrderItemService;
-import com.vincent.rsf.server.manager.service.AsnOrderLogService;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
@@ -32,6 +30,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -43,14 +44,13 @@
* @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;
@Autowired
private ReportMsgService reportMsgService;
- @Resource
- private PurchaseMapper purchaseMapper;
+
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
@@ -59,17 +59,27 @@
private AsnOrderItemLogService asnOrderItemLogService;
@Resource
private SerialRuleMapper serialRuleMapper;
+ @Autowired
+ private MatnrService matnrService;
+ @Autowired
+ private PurchaseService purchaseService;
+ @Autowired
+ private PurchaseItemService purchaseItemService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private TaskService taskService;
@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鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
- List<PoItemsDto> items = purchaseMapper.poList(asnIds);
+ List<PoItemsDto> items = purchaseService.poList(asnIds);
if (items.isEmpty()) {
throw new CoolException("鐗╂枡鎵�灞為噰璐崟鎹笉瀛樺湪锛侊紒");
}
@@ -81,17 +91,17 @@
}
@Override
- public List<AsnOrder> getListByMatnr(Map<String, String> params) {
+ public List<WkOrder> getListByMatnr(Map<String, String> params) {
if (Objects.isNull(params)) {
throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
- 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")));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .like(!Objects.isNull(params.get("maktx")), WkOrderItem::getMaktx, params.get("maktx"))
+ .eq(!Objects.isNull(params.get("matnrCode")), WkOrderItem::getMatnrCode, params.get("matnrCode")));
if (orderItems.isEmpty()) {
return new ArrayList<>();
}
- List<Long> longList = orderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
+ List<Long> longList = orderItems.stream().map(WkOrderItem::getOrderId).collect(Collectors.toList());
return this.listByIds(longList);
}
@@ -102,7 +112,7 @@
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
@@ -117,10 +127,11 @@
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
}
if (params.getItems().isEmpty()) {
- throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负瀵掗鑺傦紒锛�");
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
}
+ params.setOrders(orders);
- svaeOrUpdateOrderItem(params,loginUserId);
+ svaeOrUpdateOrderItem(params, loginUserId);
return R.ok("淇濆瓨鎴愬姛!!");
}
@@ -135,7 +146,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("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
@@ -149,35 +160,34 @@
return R.ok("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- svaeOrUpdateOrderItem(params,loginUserId);
+ svaeOrUpdateOrderItem(params, loginUserId);
return R.ok("淇敼瀹屾垚锛侊紒");
}
/**
- * @author Ryan
- * @description 鏇存柊鎴栦繚瀛樻槑缁�
* @param
* @return
+ * @author Ryan
+ * @description 鏇存柊鎴栦繚瀛樻槑缁�
* @time 2025/4/7 13:28
*/
@Transactional(rollbackFor = Exception.class)
- private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
- AsnOrder orders = params.getOrders();
-
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
- item.put("asnId", orders.getId());
- item.put("asnCode", orders.getCode());
+ item.put("orderId", orders.getId());
+ item.put("orderCode", orders.getCode());
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, params.getOrders().getId()));
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
@@ -185,26 +195,26 @@
}
/**
- * @author Ryan
- * @description 鎵归噺淇敼
* @param
* @return
+ * @author Ryan
+ * @description 鎵归噺淇敼
* @time 2025/4/1 07:58
*/
@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));
}
/**
@@ -218,13 +228,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("鏀惰揣瀹屾垚澶辫触锛侊紒");
}
@@ -234,7 +244,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("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -248,13 +258,226 @@
/**
* @author Ryan
- * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
+ * @date 2025/5/13
+ * @description: 鏍规嵁PO鍗曞垱寤篈SN鍗�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R createByPo(Map<String, Object> params) {
+ Long purchaseId = Long.parseLong(params.get("purchaseId").toString());
+ List<PurchaseItem> itemList = JSONArray.parseArray(JSONObject.toJSONString(params.get("items")), PurchaseItem.class);
+ if (itemList.isEmpty()) {
+ throw new CoolException("PO鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
+ }
+ Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getId, purchaseId));
+ if (Objects.isNull(purchase)) {
+ throw new CoolException("PO鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ WkOrder order = new WkOrder();
+ //鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
+ order.setCode(code)
+ .setArrTime(purchase.getPreArr())
+ .setType(purchase.getType())
+ .setWkType(purchase.getWkType())
+ .setPoId(purchase.getId())
+ .setPoCode(purchase.getCode());
+ if (!this.save(order)) {
+ throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+ List<WkOrderItem> orderItems = new ArrayList<>();
+ for (PurchaseItem item : itemList) {
+ WkOrderItem orderItem = new WkOrderItem();
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
+ }
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+
+ PurchaseItem service = purchaseItemService.getById(item.getId());
+ Double qty = Math.round((service.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ if (qty.compareTo(service.getAnfme()) > 0) {
+ throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
+ }
+ orderItem.setAnfme(item.getAnfme())
+ .setOrderId(order.getId())
+ .setSplrName(item.getSplrName())
+ .setOrderCode(code)
+ .setSplrBatch(item.getSplrBatch())
+ .setSplrCode(item.getSplrCode())
+ .setPoDetlId(item.getId())
+ .setPlatItemId(item.getPlatItemId())
+ .setTrackCode(trackCode)
+ .setPoCode(purchase.getCode())
+ .setPurQty(item.getAnfme())
+ .setStockUnit(item.getUnit())
+ .setPurUnit(item.getUnit())
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setMatnrId(matnr.getId());
+ orderItems.add(orderItem);
+
+ PurchaseItem purchaseItem = purchaseItemService.getOne(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getId, item.getId()));
+ if (Objects.isNull(purchaseItem)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ purchaseItem.setQty(toQty);
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+
+ if (!asnOrderItemService.saveBatch(orderItems)) {
+ throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
+ }
+ //浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
+ Double qty = Math.round((sum + purchase.getQty()) * 10000) / 10000.0;
+ purchase.setQty(qty)
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
+
+ if (!purchaseService.saveOrUpdate(purchase)) {
+ throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
+ }
+ order.setAnfme(sum);
+ if (!this.updateById(order)) {
+ throw new CoolException("鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
+
+ return R.ok("鎿嶄綔鎴愬姛锛侊紒");
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/14
+ * @description: 绉婚櫎鏀惰揣鍗�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R removeOrders(List<Long> ids) {
+ for (Long id : ids) {
+ List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, id));
+ if (list.isEmpty()) {
+ continue;
+ }
+
+ list.forEach(item -> {
+ PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
+ if (!Objects.isNull(purchaseItem)) {
+ Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 10000) / 10000.0;
+ purchaseItem.setQty(minusQty);
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
+ }
+ });
+
+ double sum = list.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+
+ Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
+ .eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
+ if (!Objects.isNull(purchase)) {
+ Double qty = Math.round((purchase.getQty() - sum) * 10000) / 10000.0;
+ purchase.setQty(qty)
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
+
+ if (!purchaseService.updateById(purchase)) {
+ throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
+ }
+ }
+
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>()
+ .in(WkOrder::getId, ids)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
+ }
+
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, ids))) {
+// throw new CoolException("Details Delete Fail");
+ }
+
+ return R.ok("鎿嶄綔鎴愬姛锛侊紒");
+ }
+
+ /**
+ * 鑾峰彇棣栭〉琛ㄥご鏁版嵁
+ * @return
+ */
+ @Override
+ public R getDashbord() {
+ DashboardDto dto = new DashboardDto();
+ //鑾峰彇鍏ュ簱鏁伴噺
+ DashboardDto trandDto = this.baseMapper.getDashbord(OrderType.ORDER_IN.type, TaskType.TASK_TYPE_IN.type + "");
+ dto.setInAnf(trandDto.getAnfme()).setTaskIn(trandDto.getRealAnfme()).setTotalIn(trandDto.getAnfme() + trandDto.getRealAnfme());
+
+ //鑾峰彇鍑哄簱鍗曟暟閲�
+ DashboardDto outTrand = this.baseMapper.getDashbord(OrderType.ORDER_OUT.type, TaskType.TASK_TYPE_OUT.type + "");
+ dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());
+
+ //鑾峰彇鎵ц涓换鍔℃暟閲�
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
+ if (!tasks.isEmpty()) {
+ dto.setTaskQty(tasks.size());
+ }
+ return R.ok().add(dto);
+ }
+
+ /**
+ * 鑾峰彇鍑哄叆搴撹秼鍔�
+ * @return
+ */
+ @Override
+ public R getStockTrand() {
+ List<String> days = DateUtils.getLastMonthDays("yyyy-MM-dd");
+ LambdaQueryWrapper<StockStatistic> queryWrapper = new LambdaQueryWrapper<StockStatistic>()
+ .in(StockStatistic::getTaskType, Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type));
+ List<StockTransItemDto> items = this.baseMapper.getStockTrand(queryWrapper);
+ if (items.isEmpty()) {
+ return R.ok();
+ }
+ List<StockTransItemDto> stockDtos = new ArrayList<>();
+ days.forEach(day -> {
+ StockTransItemDto itemDto = new StockTransItemDto();
+ itemDto.setInQty(0).setOutQty(0).setOutAnfme(0).setOutAnfme(0);
+ items.forEach(item -> {
+ if (item.getOrderTime().equals(day)) {
+ BeanUtils.copyProperties(item, itemDto);
+ }
+ });
+ itemDto.setOrderTime(day);
+ stockDtos.add(itemDto);
+ });
+
+ //鑾峰彇鏈�澶у��
+ Optional<Integer> max = stockDtos.stream().map(StockTransItemDto::getInQty).filter(Objects::nonNull).max(Comparator.naturalOrder());
+ Optional<Integer> maxOut = stockDtos.stream().map(StockTransItemDto::getOutQty).filter(Objects::nonNull).max(Comparator.naturalOrder());
+ int maxed = Math.max(max.orElse(Integer.MIN_VALUE), maxOut.orElse(Integer.MIN_VALUE));
+
+ StockTrandDto trandDto = new StockTrandDto();
+ trandDto.setMaxQty(maxed).setTrandItem(stockDtos);
+ return R.ok().add(trandDto);
+ }
+
+ /**
* @param
* @return
+ * @author Ryan
+ * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
* @time 2025/3/19 19:53
*/
@Transactional(rollbackFor = Exception.class)
- private 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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -263,42 +486,42 @@
if (!this.updateById(asrder)) {
throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, asrder.getId()));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
// 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);
+// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
BeanUtils.copyProperties(order, orderLog);
orderLog.setId(null);
orderLog.setAsnId(order.getId());
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
+// if (!this.saveOrUpdate(order)) {
+// throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+// }
+// orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
if (!asnOrderLogService.save(orderLog)) {
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
itemLog.setAsnItemId(itemLog.getId())
.setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
+ .setAsnId(item.getOrderId());
logs.add(itemLog);
});
if (!asnOrderItemLogService.saveBatch(logs)) {
throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
if (!this.removeById(asrder.getId())) {
--
Gitblit v1.9.1