From 369719fca815076435ebdd8950dd34f362c66cb3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:12 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 42 ++++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 186 ++++++++++++++++++++++++------------
rsf-admin/src/page/orders/asnOrder/POItemModal.jsx | 18 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 4
4 files changed, 159 insertions(+), 91 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx b/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
index 0e9ccc3..4bd0981 100644
--- a/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
@@ -105,21 +105,21 @@
const handleSubmit = async () => {
setFinally()
setDisabled(true)
- setOpen(false)
const parmas = {
"purchaseId": record,
"items": tabelData,
}
console.log('--------->');
console.log(parmas);
- // const res = await request.post(`/asnOrder/purchases/save`, parmas);
- // if (res?.data?.code === 200) {
- // setOpen(false);
- // refresh();
- // resetData()
- // } else {
- // notify(res.data.msg);
- // }
+ const res = await request.post(`/asnOrder/purchases/save`, parmas);
+ if (res?.data?.code === 200) {
+ notify(res.data.msg);
+ } else {
+ notify(res.data.msg);
+ }
+ setOpen(false);
+ refresh();
+ resetData()
setDisabled(false)
};
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 9e5bcfc..70613d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -8,6 +8,8 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.entity.Purchase;
+import com.vincent.rsf.server.manager.entity.PurchaseItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -21,8 +23,11 @@
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
+import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.PurchaseServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -35,6 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -44,6 +50,10 @@
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private PurchaseServiceImpl purchaseService;
+ @Autowired
+ private PurchaseItemServiceImpl purchaseItemService;
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/page")
@@ -110,18 +120,11 @@
@PostMapping("/asnOrder/remove/{ids}")
@Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- if (!asnOrderService.remove(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, Arrays.asList(ids)).eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
- return R.error("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
+ if (Objects.isNull(ids) || ids.length == 0) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- for (Long id : ids) {
- List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
- if (!list.isEmpty()) {
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, ids))) {
- throw new CoolException("Details Delete Fail");
- }
- }
- }
- return R.ok("鍒犻櫎鎴愬姛锛侊紒").add(ids);
+
+ return asnOrderService.removeOrders(Arrays.asList(ids));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -225,15 +228,18 @@
@ApiOperation("鏍规嵁PO鍗曟柊寤烘敹璐у崟")
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
public R orderCreateByPo(@RequestBody Map<String, Object> params) {
- if (Objects.isNull(params.get("ids"))) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ if (Objects.isNull(params.get("purchaseId"))) {
+ return R.error("PO涓诲崟ID涓嶈兘涓虹┖锛侊紒");
}
- String json = params.get("ids").toString();
- List<Long> ids = JSONArray.parseArray(params.get("ids").toString(), Long.class);
- if (ids.isEmpty()) {
- return R.error("鍙傛暟涓嶈兘涓虹┖");
+ if (Objects.isNull(params.get("items"))) {
+ return R.error("鏄庣粏鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
- return asnOrderService.createByPo(ids);
+// List<Long> ids = JSONArray.parseArray(params.get("ids").toString(), Long.class);
+// if (ids.isEmpty()) {
+// return R.error("鍙傛暟涓嶈兘涓虹┖");
+// }
+
+ return asnOrderService.createByPo(params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
index 060bd61..6a9eb9b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -25,5 +25,7 @@
R closeOrder(Long id);
- R createByPo(List<Long> ids);
+ R createByPo(Map<String, Object> params);
+
+ R removeOrders(List<Long> list);
}
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 d1aa2c0..93a3df4 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;
@@ -253,78 +254,137 @@
* @version 1.0
*/
@Override
- public R createByPo(List<Long> ids) {
- //鑾峰彇鏈敓鎴怉SN鍗曟嵁
- List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().in(Purchase::getId, ids));
- //鐢熸垚ASN鍗曟嵁
- purchases.forEach(purchase -> {
- if (!Objects.isNull(purchase.getStartTime())) {
- //鍒ゆ柇璧峰鏃堕棿鏄惁澶т簬褰撳墠鏃堕棿
- if (DateUtils.compareDate(new Date(), purchase.getStartTime())) {
- return;
- }
+ 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("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
}
- List<PurchaseItem> items = purchaseItemService.list(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getPurchaseId, purchase.getId()));
- if (items.isEmpty()) {
- throw new CoolException("瀛愬垪琛ㄦ暟鎹负绌猴紝璇锋煡璇O鍗曟槸鍚︽纭綍鍏ワ紒锛�");
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
}
- AsnOrder order = new AsnOrder();
- //鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
- String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
- order.setAnfme(purchase.getAnfme())
- .setCode(code)
- .setArrTime(purchase.getPreArr())
- .setQty(purchase.getQty())
- .setPoId(purchase.getId())
- .setPoCode(purchase.getCode());
- if (!this.save(order)) {
- throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ 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);
+
+
+// purchaseItemService.update(new LambdaUpdateWrapper<>().set(PurchaseItem::getAnfme, ));
+
+ }
+
+ double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+
+ if (!asnOrderItemService.saveBatch(orderItems)) {
+ throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
+ }
+ //浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
+ purchase.setQty(sum + purchase.getQty())
+ .setAnfme(purchase.getAnfme() - sum)
+ .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<AsnOrderItem> orderItems = new ArrayList<>();
- items.forEach(item -> {
- AsnOrderItem orderItem = new AsnOrderItem();
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
- if (Objects.isNull(matnr)) {
- throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
+
+ list.forEach(item -> {
+ PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
+ if (!Objects.isNull(purchaseItem)) {
+ purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme())
+ .setAnfme(purchaseItem.getAnfme() + item.getAnfme());
}
- String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
- if (StringUtils.isBlank(trackCode)) {
- throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
}
-// String barcode = code + matnr.getCode();
- orderItem.setAnfme(item.getAnfme())
- .setAsnId(order.getId())
- .setQty(item.getAnfme())
- .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())
- .setPurUnit(item.getUnit())
- .setMatnrCode(matnr.getCode())
- .setMaktx(matnr.getName())
- .setMatnrId(matnr.getId());
- orderItems.add(orderItem);
});
- if (!asnOrderItemService.saveBatch(orderItems)) {
- throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
+
+ 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)
+ .setAnfme(purchase.getAnfme() + sum);
+
+ if (!purchaseService.updateById(purchase)) {
+ throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
}
-
- //浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
- purchase.setQty(purchase.getAnfme())
- .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
-
- if (!purchaseService.saveOrUpdate(purchase)) {
- throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
- }
- });
+ }
- return null;
+
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getAsnId, ids))) {
+ throw new CoolException("Details Delete Fail");
+ }
+
+ if (!this.remove(new LambdaQueryWrapper<AsnOrder>()
+ .in(AsnOrder::getId, ids)
+ .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
+ }
+
+ return R.ok("鎿嶄綔鎴愬姛锛侊紒");
}
/**
--
Gitblit v1.9.1