From 0b190d8a9aad67aa521ec163b437c59f6e63c400 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 14:04:27 +0800
Subject: [PATCH] 盘点单下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 147 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index 51845f5..941cabb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,18 +11,29 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
+import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
+import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
+import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@Api("鐩樼偣")
@RestController
@@ -30,13 +42,12 @@
@Autowired
private CheckOrderService checkOrderService;
-
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/check/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> wrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> wrapper = pageParam.buildWrapper(true);
wrapper.eq("type", OrderType.ORDER_CHECK.type);
return R.ok().add(checkOrderService.page(pageParam, wrapper));
}
@@ -62,7 +73,7 @@
@PreAuthorize("hasAuthority('manager:check:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/check/save")
- public R save(@RequestBody AsnOrder order) {
+ public R save(@RequestBody WkOrder order) {
order.setType(OrderType.ORDER_CHECK.type);
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, order);
if (Objects.isNull(ruleCode)) {
@@ -77,7 +88,7 @@
@PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/check/update")
- public R update(@RequestBody AsnOrder order) {
+ public R update(@RequestBody WkOrder order) {
order.setUpdateTime(null);
order.setUpdateBy(getLoginUserId());
if (!checkOrderService.updateById(order)) {
@@ -90,19 +101,41 @@
@OperationLog("Delete 瀛楀吀鏁版嵁闆�")
@PostMapping("/check/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
- if (!checkOrderService.removeByIds(Arrays.asList(ids))) {
+ if (Objects.isNull(ids)) {
+ throw new RuntimeException("鐩樼偣鍗旾D涓嶈兘涓虹┖锛侊紒");
+ }
+ List<WkOrder> wkOrders = checkOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, Arrays.asList(ids)));
+ if (wkOrders.isEmpty()) {
+ return R.ok();
+ }
+ List<WkOrder> orders = wkOrders.stream().filter(order -> order.getExceStatus().equals(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)).collect(Collectors.toList());
+ if (orders.isEmpty()) {
+ return R.ok();
+ }
+ List<Long> orderIds = orders.stream().map(WkOrder::getId).collect(Collectors.toList());
+ if (!checkOrderService.removeByIds(orderIds)) {
return R.error("Delete Fail");
}
return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStock:update')")
+ @ApiOperation("鍙栨秷鐩樼偣鍗曟嵁")
+ @GetMapping("/check/cancel/{id}")
+ public R cancel(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return checkOrderService.cancelCheckOrder(id);
}
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/check/query")
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);
}
checkOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -113,13 +146,115 @@
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/check/export")
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"))) {
- orders = checkOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")));
+ orders = checkOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, map.get("ids")));
} else {
orders = checkOrderService.list();
}
- ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
+ ExcelUtil.build(ExcelUtil.create(orders, WkOrder.class), response);
+ }
+
+ @PostMapping("/check/items/save")
+ @ApiOperation("淇濆瓨鐩樼偣鍗曞強鏄庣粏")
+ @PreAuthorize("hasAuthority('manager:check:save')")
+ public R saveOutStock(@RequestBody AsnOrderAndItemsParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return checkOrderService.saveCheckOrder(params, getLoginUserId());
+ }
+
+ @ApiOperation("鐩樼偣鍗曚俊鎭慨鏀�")
+ @PostMapping("/check/items/update")
+ @PreAuthorize("hasAuthority('manager:check:update')")
+ public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return checkOrderService.updateOrderItem(params, getLoginUserId());
+ }
+
+ @PostMapping("/check/order/items")
+ @ApiOperation("鐩樼偣鍑哄簱棰勮")
+ @PreAuthorize("hasAuthority('manager:check:list')")
+ public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ return checkOrderService.genCheckPreview(param);
+ }
+
+
+ /**
+ * 鐩樼偣鍗曠敓鎴愬嚭搴撲换鍔�
+ * @param params
+ * @return
+ */
+ @PostMapping("/check/generate/tasks")
+ @ApiOperation("鐢熸垚鐩樼偣鍑哄簱浠诲姟")
+ @PreAuthorize("hasAuthority('manager:outStock:list')")
+ public R genCheckOutTask( @RequestBody List<CheckOrderParams> params) {
+ if (Cools.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return checkOrderService.genCheckOutTask(params, getLoginUserId());
+ }
+
+ /**
+ * 鑾峰彇鍑哄簱绔欑偣
+ * @return
+ */
+ @GetMapping("/check/tasks/sites")
+ @ApiOperation("鑾峰彇鐩樼偣鍑哄簱鍙�")
+ @PreAuthorize("hasAuthority('manager:check:list')")
+ public R getSiteNos() {
+ return checkOrderService.getSiteNos();
+ }
+
+
+ @ApiOperation("鑾峰彇鍦ㄥ簱鐗╂枡鍒楄〃")
+ @PostMapping("/check/locs/{matnrs}")
+ @PreAuthorize("hasAuthority('manager:check:list')")
+ public R getAllLocByMatnr(@PathVariable String[] matnrs) {
+ if (Objects.isNull(matnrs)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return checkOrderService.getAllLocByMatnr(Arrays.asList(matnrs));
+ }
+
+
+ /**
+ * @author Ryan
+ * @description 涓嬭浇妯℃澘
+ * @param
+ * @return
+ * @time 2025/4/18 08:17
+ */
+ @PostMapping("/check/template/download")
+ @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
+ @PreAuthorize("hasAuthority('manager:check:update')")
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
+ List<CheckOrderTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
+ }
+
+ /**
+ * 鐩樼偣鍗曞鍏�
+ * @param file
+ * @return
+ */
+ @PostMapping("/check/import")
+ @ApiOperation("ASN瀵煎叆鎺ュ彛")
+ @PreAuthorize("hasAuthority('manager:check:update')")
+ public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception {
+ if (Objects.isNull(file)) {
+ return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ }
+ HashMap<String, Object> hashMap = new HashMap<>();
+ return checkOrderService.excelImport(file, hashMap, getLoginUserId());
}
}
--
Gitblit v1.9.1