From 7ea1537c02273a796781bb05f8b0c87969aeccc6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 16:48:38 +0800
Subject: [PATCH] 问题清单修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 382 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 361 insertions(+), 21 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 c77fa5f..beaad9f 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,26 +1,31 @@
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;
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.common.utils.DateUtils;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
+import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.POExceStatus;
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.AsnOrderItemService;
-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.entity.SerialRule;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
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.*;
@@ -40,14 +45,21 @@
private ReceiveMsgService receiveMsgService;
@Autowired
private ReportMsgService reportMsgService;
- @Resource
- private PurchaseMapper purchaseMapper;
@Autowired
private AsnOrderItemService asnOrderItemService;
-
+ @Autowired
+ private AsnOrderLogService asnOrderLogService;
+ @Autowired
+ private AsnOrderItemLogService asnOrderItemLogService;
@Resource
private SerialRuleMapper serialRuleMapper;
+ @Autowired
+ private MatnrService matnrService;
+ @Autowired
+ private PurchaseService purchaseService;
+ @Autowired
+ private PurchaseItemService purchaseItemService;
@Override
public boolean notifyInspect(List<AsnOrder> orders) {
@@ -58,14 +70,16 @@
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("鐗╂枡鎵�灞為噰璐崟鎹笉瀛樺湪锛侊紒");
+ }
if (reportMsgService.reportInspectNotify(items)) {
return true;
} else {
return false;
}
}
-
@Override
public List<AsnOrder> getListByMatnr(Map<String, String> params) {
@@ -75,7 +89,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<>();
}
@@ -85,33 +98,360 @@
}
@Override
- public R saveOrderAndItems(AsnOrderAndItemsParams params) {
+ @Transactional(rollbackFor = Exception.class)
+ public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
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("涓诲崟淇濆瓨澶辫触锛侊紒");
}
if (params.getItems().isEmpty()) {
- throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负瀵掗鑺傦紒锛�");
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
}
+ params.setOrders(orders);
+
+ svaeOrUpdateOrderItem(params, loginUserId);
+
+ return R.ok("淇濆瓨鎴愬姛!!");
+ }
+
+ /**
+ * 琛ㄥ崟鏄庣粏淇敼
+ *
+ * @param params
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(orders.getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!this.updateById(orders)) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ return R.ok("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ svaeOrUpdateOrderItem(params, loginUserId);
+
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鏇存柊鎴栦繚瀛樻槑缁�
+ * @time 2025/4/7 13:28
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ AsnOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
item.put("poCode", orders.getPoCode());
-
- if (!asnOrderItemService.fieldsSave(item)) {
+ item.put("createBy", loginUserId);
+ item.put("updateBy", loginUserId);
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
-
});
- return R.ok("淇濆瓨鎴愬姛!!");
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
+ double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ orders.setAnfme(sum);
+ if (!this.updateById(orders)) {
+ throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鎵归噺淇敼
+ * @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));
+ }
+
+ /**
+ * @param id
+ * @param loginUserId
+ * @return
+ * @author Ryan
+ * @description 涓�閿敹璐�
+ * @time 2025/4/3 15:45
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R completeOrder(Long id, Long loginUserId) {
+ AsnOrder asnOrder = this.getById(id);
+ if (Objects.isNull(asnOrder)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦�!!");
+ }
+ //涓�閿姞鍏ュ巻鍙叉。
+ try {
+ operateOrderLogs(asnOrder);
+ } catch (Exception e) {
+ throw new CoolException("鏀惰揣瀹屾垚澶辫触锛侊紒");
+ }
+ return R.ok("鏀惰揣鎴愬姛锛侊紒");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R closeOrder(Long id) {
+ AsnOrder order = this.getById(id);
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ try {
+ operateOrderLogs(order);
+ } catch (Exception e) {
+ throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
+ }
+ return null;
+ }
+
+ /**
+ * @author Ryan
+ * @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鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ AsnOrder order = new AsnOrder();
+ //鏍规嵁缂栫爜瑙勫垯鐢熸垚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<AsnOrderItem> orderItems = new ArrayList<>();
+ for (PurchaseItem item : itemList) {
+ AsnOrderItem orderItem = new AsnOrderItem();
+ 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 = service.getQty() + item.getAnfme();
+ if (qty.compareTo(service.getAnfme()) > 0) {
+ throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
+ }
+ orderItem.setAnfme(item.getAnfme())
+ .setAsnId(order.getId())
+ .setSplrName(item.getSplrName())
+ .setAsnCode(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("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ purchaseItem.setQty(purchaseItem.getQty() + item.getAnfme());
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+
+ if (!asnOrderItemService.saveBatch(orderItems)) {
+ throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
+ }
+ //浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
+ purchase.setQty(sum + purchase.getQty())
+ .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<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getAsnId, id));
+ if (list.isEmpty()) {
+ continue;
+ }
+
+ list.forEach(item -> {
+ PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
+ if (!Objects.isNull(purchaseItem)) {
+ purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());
+ }
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
+ });
+
+ double sum = list.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+
+ Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
+ .eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
+ purchase.setQty(purchase.getQty() - sum)
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
+
+ if (!purchaseService.updateById(purchase)) {
+ throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
+ }
+
+ if (!this.remove(new LambdaQueryWrapper<AsnOrder>()
+ .in(AsnOrder::getId, ids)
+ .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
+ }
+
+
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getAsnId, ids))) {
+// throw new CoolException("Details Delete Fail");
+ }
+
+ return R.ok("鎿嶄綔鎴愬姛锛侊紒");
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
+ * @time 2025/3/19 19:53
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception {
+ if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
+
+ if (!this.updateById(asrder)) {
+ throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
+ }
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, 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());
+ AsnOrderLog orderLog = new AsnOrderLog();
+// 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 (!asnOrderLogService.save(orderLog)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
+ }
+ List<AsnOrderItemLog> logs = new ArrayList<>();
+ List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ items.forEach(item -> {
+ AsnOrderItemLog itemLog = new AsnOrderItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setAsnItemId(itemLog.getId())
+ .setLogId(orderLog.getId())
+ .setAsnId(item.getAsnId());
+ logs.add(itemLog);
+ });
+
+ if (!asnOrderItemLogService.saveBatch(logs)) {
+ throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
+ }
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
+ throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+ }
+ if (!this.removeById(asrder.getId())) {
+ throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+ }
}
}
--
Gitblit v1.9.1