From 275bcf975a288730b7e3c26f67fe484bc33f0510 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 12 六月 2025 08:51:33 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 226 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 191 insertions(+), 35 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 08d52a5..576f97b 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,14 @@
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.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
-import com.vincent.rsf.server.manager.entity.AsnOrderLog;
+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.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;
@@ -49,8 +45,7 @@
private ReceiveMsgService receiveMsgService;
@Autowired
private ReportMsgService reportMsgService;
- @Resource
- private PurchaseMapper purchaseMapper;
+
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
@@ -59,6 +54,12 @@
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) {
@@ -69,7 +70,7 @@
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("鐗╂枡鎵�灞為噰璐崟鎹笉瀛樺湪锛侊紒");
}
@@ -117,10 +118,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("淇濆瓨鎴愬姛!!");
}
@@ -149,29 +151,28 @@
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{
+ 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());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
@@ -185,10 +186,10 @@
}
/**
- * @author Ryan
- * @description 鎵归噺淇敼
* @param
* @return
+ * @author Ryan
+ * @description 鎵归噺淇敼
* @time 2025/4/1 07:58
*/
@Override
@@ -199,11 +200,11 @@
}
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(!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));
}
@@ -248,17 +249,172 @@
/**
* @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鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ 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 = Math.round((service.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ 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("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ 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(AsnOrderItem::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<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)) {
+ 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(AsnOrderItem::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<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)
- private void operateOrderLogs(AsnOrder asrder) throws Exception{
+ public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception {
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- asrder.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val));
+ asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
if (!this.updateById(asrder)) {
throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
@@ -272,15 +428,15 @@
// }
AsnOrder order = this.getById(asrder.getId());
AsnOrderLog orderLog = new AsnOrderLog();
- order.setExceStatus(Short.parseShort(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(Short.parseShort(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("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
--
Gitblit v1.9.1