From 1e01cb4da6055dd19c720a7012301ec34bee982a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 30 六月 2025 16:41:04 +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/OutStockItemController.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 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
index c30e58b..989d23d 100644
--- 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
@@ -17,6 +17,7 @@
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.entity.excel.OutStockTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.CompanysService;
@@ -50,30 +51,6 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
- if (!Objects.isNull(map.get("poDetlId"))) {
- queryWrapper.in("po_detl_id", JSONArray.parseArray(JSONArray.toJSONString(map.get("poDetlId")), Long.class));
- }
- return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
- }
-
-
- @PreAuthorize("hasAuthority('manager:outStockItem:list')")
- @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
- @PostMapping("/outStockItem/edit/page")
- public R byPoIdspage(@RequestBody Map<String, Object> map) {
- List<Long> poDetlIds = new ArrayList<>();
- if (!Objects.isNull(map.get("poDetlId"))) {
- poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("poDetlId")), Long.class);
- map.remove("poDetlId");
- }
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
- if (!poDetlIds.isEmpty()) {
- queryWrapper.in("po_detl_id", poDetlIds);
- } else {
- return R.ok();
- }
return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
}
@@ -195,6 +172,21 @@
return outStockItemService.excelImport(file, hashMap, getLoginUserId());
}
+ /**
+ * @author Ryan
+ * @description 涓嬭浇妯℃澘
+ * @param
+ * @return
+ * @time 2025/4/18 08:17
+ */
+ @PostMapping("/outStock/template/download")
+ @ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�")
+ @PreAuthorize("hasAuthority('manager:outStockItem:update')")
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ OutStockTemplate template = ExcelUtil.mockData(OutStockTemplate.class);
+ List<OutStockTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, OutStockTemplate.class, true), response);
+ }
}
--
Gitblit v1.9.1