From 72ca54b5a36818de16acf81c9c395e9f35a39a67 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 11 六月 2025 09:53:27 +0800
Subject: [PATCH] 下发执行页，添加默认请求方法
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 152 insertions(+), 13 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 51fb9d5..24fc8af 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
@@ -1,17 +1,33 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
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.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;
@@ -19,12 +35,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import javax.mail.Multipart;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -32,13 +48,22 @@
@Autowired
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);
- return R.ok().add(asnOrderService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<AsnOrder> 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));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -54,6 +79,7 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(asnOrderService.getById(id));
@@ -92,11 +118,12 @@
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@OperationLog("Delete ASN鍗曟嵁")
@PostMapping("/asnOrder/remove/{ids}")
+ @Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- if (!asnOrderService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (Objects.isNull(ids) || ids.length == 0) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Delete Success").add(ids);
+ return asnOrderService.removeOrders(Arrays.asList(ids));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -118,11 +145,46 @@
@PostMapping("/asnOrder/export")
@ApiOperation("瀵煎嚭")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(asnOrderService.list(), AsnOrder.class), response);
+ List<AsnOrder> 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));
+ } else {
+ orders = asnOrderService.list(new LambdaQueryWrapper<>());
+ }
+ } else {
+ 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) {
+ if (Objects.isNull(item)) {
+ continue;
+ }
+ AsnOrderTemplate template = new AsnOrderTemplate();
+ template.setCode(order.getCode())
+ .setType(OrderType.getValType(order.getType()))
+ .setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
+ .setAnfme(item.getAnfme() + "")
+ .setMaktx(item.getMaktx())
+ .setMemo(item.getMemo())
+ .setMatnrCode(item.getMatnrCode())
+ .setPoCode(item.getPoCode())
+ .setSplrName(item.getSplrName())
+ .setPlatItemId(item.getPlatItemId())
+ .setSplrBatch(item.getSplrBatch())
+ .setSplrCode(item.getSplrCode());
+ orderTemplates.add(template);
+ }
+ }
+ ExcelUtil.build(ExcelUtil.create(orderTemplates, AsnOrderTemplate.class), response);
}
/**
* 璐ㄦ涓婃姤
+ *
* @param orders
* @return
*/
@@ -140,13 +202,90 @@
}
}
- @PostMapping("/asnOrder/generate/barcode")
- @ApiOperation("鐢熸垚ASN鏍囩")
+ @PostMapping("/asnOrder/matnr/list")
+ @ApiOperation("鐗╂枡鑾峰彇璁㈠崟")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R generateBarcode(@RequestBody List<AsnOrder> orders) {
- if (orders.isEmpty()) {
- return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
+ public R getListByMatnr(@RequestBody Map<String, String> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
- return asnOrderService.generateBarcode(orders);
+ return R.ok(asnOrderService.getListByMatnr(params));
}
+
+
+ @PostMapping("/asnOrder/items/save")
+ @ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�")
+ @PreAuthorize("hasAuthority('manager:asnOrder:save')")
+ public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ 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')")
+ public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.updateOrderItem(params, getLoginUserId());
+ }
+
+ @ApiOperation("鍗曟嵁鎵归噺淇敼")
+ @PostMapping("/asnOrder/batch/update")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R batchUpdate(@RequestBody BatchUpdateParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrder())) {
+ return R.error("淇敼鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
+ return R.error("淇敼ID涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(asnOrderService.batchUpdate(params, getLoginUserId()));
+ }
+
+ @ApiOperation("涓�閿敹璐�")
+ @PostMapping("/asnOrder/complete/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R completeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.completeOrder(id, getLoginUserId());
+ }
+
+ @ApiOperation("鍏抽棴鏀惰揣鍗�")
+ @PostMapping("/asnOrder/close/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R closeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.closeOrder(id);
+ }
+
}
--
Gitblit v1.9.1