From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 insertions(+), 4 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 e088b8a..2e9e296 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
@@ -4,22 +4,32 @@
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.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.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;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.mail.Multipart;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
+@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
public class AsnOrderController extends BaseController {
@Autowired
@@ -46,6 +56,7 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(asnOrderService.getById(id));
@@ -54,11 +65,14 @@
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrder/save")
+ @ApiOperation("淇濆瓨")
public R save(@RequestBody AsnOrder asnOrder) {
asnOrder.setCreateBy(getLoginUserId());
- asnOrder.setCreateTime(new Date());
asnOrder.setUpdateBy(getLoginUserId());
- asnOrder.setUpdateTime(new Date());
+ 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");
}
@@ -68,6 +82,7 @@
@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());
@@ -89,24 +104,110 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/query")
+ @ApiOperation("鏌ヨ")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getName, condition);
+ wrapper.like(AsnOrder::getCode, condition);
}
asnOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
return R.ok().add(vos);
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@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);
}
+ /**
+ * 璐ㄦ涓婃姤
+ * @param orders
+ * @return
+ */
+ @PostMapping("/asnOrder/inspect")
+ @ApiOperation("璐ㄦ涓婃姤")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R notifyInspect(@RequestBody List<AsnOrder> orders) {
+ if (orders.isEmpty()) {
+ return R.error("涓婃姤鍗曟嵁涓嶈兘涓虹┖!!");
+ }
+ if (asnOrderService.notifyInspect(orders)) {
+ return R.ok("璐ㄦ涓婃姤鎴愬姛锛侊紒");
+ } else {
+ 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