From ebdfa825c07189b5f8e89f147d96d1bc612589db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:32:17 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 93 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 39 deletions(-)
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 d3c112c..2bd086e 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
@@ -7,7 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -17,12 +18,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
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.AsnOrder;
-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.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;
@@ -44,15 +44,19 @@
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private PurchaseServiceImpl purchaseService;
+ @Autowired
+ private PurchaseItemServiceImpl purchaseItemService;
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
- List<String> asList = Arrays.asList(OrderType.ORDER_OUT.type);
- queryWrapper.notIn("type", asList);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
+ List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
+ queryWrapper.in("type", asList);
return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
}
@@ -79,30 +83,30 @@
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrder/save")
@ApiOperation("淇濆瓨")
- public R save(@RequestBody AsnOrder asnOrder) {
- asnOrder.setCreateBy(getLoginUserId());
- asnOrder.setUpdateBy(getLoginUserId());
- String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, asnOrder);
+ public R save(@RequestBody WkOrder wkOrder) {
+ wkOrder.setCreateBy(getLoginUserId());
+ wkOrder.setUpdateBy(getLoginUserId());
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, wkOrder);
if (!Objects.isNull(code)) {
- asnOrder.setCode(code);
+ wkOrder.setCode(code);
}
- if (!asnOrderService.save(asnOrder)) {
+ if (!asnOrderService.save(wkOrder)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(asnOrder);
+ return R.ok("Save Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrder/update")
@ApiOperation("鏇存柊")
- public R update(@RequestBody AsnOrder asnOrder) {
- asnOrder.setUpdateBy(getLoginUserId());
- asnOrder.setUpdateTime(new Date());
- if (!asnOrderService.updateById(asnOrder)) {
+ public R update(@RequestBody WkOrder wkOrder) {
+ wkOrder.setUpdateBy(getLoginUserId());
+ wkOrder.setUpdateTime(new Date());
+ if (!asnOrderService.updateById(wkOrder)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrder);
+ return R.ok("Update Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@@ -110,18 +114,10 @@
@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')")
@@ -129,9 +125,9 @@
@ApiOperation("鏌ヨ")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getCode, condition);
+ wrapper.like(WkOrder::getCode, condition);
}
asnOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -143,11 +139,11 @@
@PostMapping("/asnOrder/export")
@ApiOperation("瀵煎嚭")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrder> orders = new ArrayList<>();
+ List<WkOrder> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
if (!ids.isEmpty()) {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
+ orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
} else {
orders = asnOrderService.list(new LambdaQueryWrapper<>());
}
@@ -155,9 +151,9 @@
orders = asnOrderService.list();
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
- for (AsnOrder order : orders) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- for (AsnOrderItem item : orderItems) {
+ for (WkOrder order : orders) {
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
+ for (WkOrderItem item : orderItems) {
if (Objects.isNull(item)) {
continue;
}
@@ -189,7 +185,7 @@
@PostMapping("/asnOrder/inspect")
@ApiOperation("璐ㄦ涓婃姤")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R notifyInspect(@RequestBody List<AsnOrder> orders) {
+ public R notifyInspect(@RequestBody List<WkOrder> orders) {
if (orders.isEmpty()) {
return R.error("涓婃姤鍗曟嵁涓嶈兘涓虹┖!!");
}
@@ -221,6 +217,25 @@
return asnOrderService.saveOrderAndItems(params, getLoginUserId());
}
+ @PostMapping("/asnOrder/purchases/save")
+ @ApiOperation("鏍规嵁PO鍗曟柊寤烘敹璐у崟")
+ @PreAuthorize("hasAuthority('manager:asnOrder:save')")
+ public R orderCreateByPo(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params.get("purchaseId"))) {
+ return R.error("PO涓诲崟ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.get("items"))) {
+ return R.error("鏄庣粏鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
+// List<Long> ids = JSONArray.parseArray(params.get("ids").toString(), Long.class);
+// if (ids.isEmpty()) {
+// return R.error("鍙傛暟涓嶈兘涓虹┖");
+// }
+
+ return asnOrderService.createByPo(params);
+ }
+
+
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@PostMapping("/asnOrder/items/update")
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
--
Gitblit v1.9.1