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/AsnOrderItemController.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index 0b65aca..c04887e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -1,28 +1,22 @@
package com.vincent.rsf.server.manager.controller;
-import com.alibaba.fastjson.JSON;
-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;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.common.utils.CommonUtil;
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.AsnOrderItemParams;
+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.service.AsnOrderItemService;
import com.vincent.rsf.server.system.controller.BaseController;
-import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.entity.FieldsItem;
-import com.vincent.rsf.server.system.service.FieldsItemService;
-import com.vincent.rsf.server.system.service.FieldsService;
-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;
@@ -30,10 +24,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-import java.util.stream.Collectors;
@Api(tags = "ASN鍗曟槑缁�")
@RestController
@@ -43,11 +35,12 @@
private AsnOrderItemService asnOrderItemService;
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
@PostMapping("/asnOrderItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- return R.ok().add(asnOrderItemService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(asnOrderItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
}
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@@ -76,17 +69,14 @@
throw new CoolException("淇℃伅涓嶈兘涓虹┖锛侊紒");
}
params.put("createBy", getLoginUserId());
- params.put("updateBy", getLoginUser());
+ params.put("updateBy", getLoginUserId());
if (!asnOrderItemService.fieldsSave(params)) {
return R.error("Save Fail");
}
return R.ok("Save Success");
-
-
-
-
}
+
@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
@OperationLog("Update ASN鍗曟嵁")
@@ -126,7 +116,7 @@
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@PostMapping("/asnOrderItem/export")
- @ApiOperation("鏀惰揣閫氱煡鍗曟槑缁�")
+ @ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
List<AsnOrderTemplate> list = new ArrayList<>();
@@ -134,23 +124,36 @@
ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
}
+
+ @PostMapping("/asnOrderItem/generate/barcode")
+ @ApiOperation("鐢熸垚ASN鏍囩")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R generateBarcode(@RequestBody List<Long> orders) {
+ if (orders.isEmpty()) {
+ return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
+ }
+ return asnOrderItemService.generateBarcode(orders);
+ }
+
/**
* ASN鍗曟嵁鏄庣粏瀵煎叆
* @param file
* @return
*/
- @PostMapping("/asnOrder/import")
+ @PostMapping("/asnOrderItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
- @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
if (Objects.isNull(file)) {
- throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
HashMap<String, Object> hashMap = new HashMap<>();
if (!Objects.isNull(asnId)) {
hashMap.put("asnId", asnId);
}
+
return asnOrderItemService.excelImport(file, hashMap);
}
+
}
--
Gitblit v1.9.1