From 1d71e8d6e37f7e992c9db9a77b9be86cb240afa1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 11:00:28 +0800
Subject: [PATCH] #修改 1. 收货通知单导入报错问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 93 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 1 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 80e9d25..84681bd 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,5 +1,7 @@
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.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -10,9 +12,14 @@
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.Matnr;
import com.vincent.rsf.server.manager.service.AsnOrderService;
+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;
@@ -52,6 +59,7 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(asnOrderService.getById(id));
@@ -64,6 +72,10 @@
public R save(@RequestBody AsnOrder asnOrder) {
asnOrder.setCreateBy(getLoginUserId());
asnOrder.setUpdateBy(getLoginUserId());
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, asnOrder);
+ if (!Objects.isNull(code)) {
+ asnOrder.setCode(code);
+ }
if (!asnOrderService.save(asnOrder)) {
return R.error("Save Fail");
}
@@ -112,7 +124,18 @@
@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<AsnOrder>());
+ }
+ } else {
+ orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>());
+ }
+ ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
}
/**
@@ -133,4 +156,72 @@
return R.error("涓�閿笂鎶ュけ璐ワ紒锛�");
}
}
+
+ @PostMapping("/asnOrder/matnr/list")
+ @ApiOperation("鐗╂枡鑾峰彇璁㈠崟")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R getListByMatnr(@RequestBody Map<String, String> params){
+ if (Objects.isNull(params)) {
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
+ }
+ 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());
+ }
+
+ @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