From 4496b9019ba423dd1c51c719bcc0a5938d90fff9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 17:33:18 +0800
Subject: [PATCH] #修改优化 1. DO单明细编码优化 2. DO单明细新增优化 3. 出库单新增单据增加新单据功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 186 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 186 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
new file mode 100644
index 0000000..c665a12
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
@@ -0,0 +1,186 @@
+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;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+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.common.utils.ExcelUtil;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.enums.CompanysType;
+import com.vincent.rsf.server.manager.service.AsnOrderItemService;
+import com.vincent.rsf.server.manager.service.CompanysService;
+import com.vincent.rsf.server.manager.service.OutStockItemService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+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.*;
+
+@Api(tags = "鍑哄簱鍗曟槑缁�")
+@RestController
+public class OutStockItemController extends BaseController {
+
+ @Autowired
+ private OutStockItemService outStockItemService;
+
+ @Autowired
+ private CompanysService companysService;
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/outStockItem/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(outStockItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:list')")
+ @PostMapping("/outStockItem/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(outStockItemService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:list')")
+ @PostMapping({"/outStockItem/many/{ids}", "/outStockItems/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(outStockItemService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:list')")
+ @GetMapping("/outStockItem/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(outStockItemService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:save')")
+ @OperationLog("Create 鍑哄簱鍗曟槑缁�")
+ @PostMapping("/outStockItem/save")
+ public R save(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ params.put("createBy", getLoginUserId());
+ params.put("updateBy", getLoginUserId());
+
+ if (!outStockItemService.fieldsSave(params)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success");
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:update')")
+ @OperationLog("Update 鍑哄簱鍗曟槑缁�")
+ @PostMapping("/outStockItem/update")
+ public R update(@RequestBody AsnOrderItem asnOrderItem) {
+ asnOrderItem.setUpdateBy(getLoginUserId());
+ asnOrderItem.setUpdateTime(new Date());
+ if (!Objects.isNull(asnOrderItem.getSplrName()) && StringUtils.isNotBlank(asnOrderItem.getSplrName())) {
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
+ .eq(Companys::getId, asnOrderItem.getSplrName()));
+ if (!Objects.isNull(companys)) {
+ asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ }
+ }
+ if (!outStockItemService.updateById(asnOrderItem)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(asnOrderItem);
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:remove')")
+ @OperationLog("Delete 鍑哄簱鍗曟槑缁�")
+ @PostMapping("/outStockItem/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!outStockItemService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:list')")
+ @PostMapping("/outStockItem/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<AsnOrderItem> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(AsnOrderItem::getId, condition);
+ }
+ outStockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:outStockItem:list')")
+ @PostMapping("/outStockItem/export")
+ @ApiOperation("瀵煎嚭鍑哄簱鍗曟槑缁�")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ List<AsnOrderItem> orderItems = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getId, ids)
+ .eq(AsnOrderItem::getStatus, 1));
+ } else {
+ orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
+ }
+ } else {
+ orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
+ }
+
+ ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
+ }
+
+ /**
+ * ASN鍗曟嵁鏄庣粏瀵煎叆
+ * @param file
+ * @return
+ */
+ @PostMapping("/outStockItem/import")
+ @ApiOperation("ASN瀵煎叆鎺ュ彛")
+ @PreAuthorize("hasAuthority('manager:outStockItem:update')")
+ public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
+ if (Objects.isNull(file)) {
+ R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ }
+ HashMap<String, Object> hashMap = new HashMap<>();
+ return outStockItemService.excelImport(file, hashMap, getLoginUserId());
+ }
+
+ /**
+ * @author Ryan
+ * @description 涓嬭浇妯℃澘
+ * @param
+ * @return
+ * @time 2025/4/18 08:17
+ */
+ @PostMapping("/outStockItem/template/download")
+ @ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�")
+ @PreAuthorize("hasAuthority('manager:outStockItem:update')")
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
+ List<AsnOrderTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
+ }
+
+}
--
Gitblit v1.9.1