From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +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/WarehouseAreasItemController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index f2e71f2..ac79f29 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -12,6 +13,7 @@
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "搴撳尯搴撳瓨鏄庣粏")
@RestController
public class WarehouseAreasItemController extends BaseController {
@@ -30,16 +33,24 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
- return R.ok().add(warehouseAreasItemService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.select( "id","area_id","area_name","asn_id","plat_item_id","po_code",
+ "asn_code", "asn_item_id","matnr_id","maktx","matnr_code","fields_index","track_code",
+ "SUM(anfme) anfme","SUM(work_qty) work_qty","ispt_result","SUM(qty) qty", "splr_batch","batch","unit","stock_unit",
+ "brand","shipper_id","splr_id","weight","prod_time","`status`", "create_by",
+ "create_time","update_by","update_time","memo");
+ queryWrapper.groupBy("matnr_code", "splr_batch", "track_code");
+ return R.ok().add(warehouseAreasItemService.page(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@PostMapping("/warehouseAreasItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(warehouseAreasItemService.list());
+ return R.ok(warehouseAreasItemService.getList());
+// return R.ok().add(warehouseAreasItemService.list());
}
- @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list' )")
@PostMapping({"/warehouseAreasItem/many/{ids}", "/warehouseAreasItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(warehouseAreasItemService.listByIds(Arrays.asList(ids)));
@@ -56,9 +67,7 @@
@PostMapping("/warehouseAreasItem/save")
public R save(@RequestBody WarehouseAreasItem warehouseAreasItem) {
warehouseAreasItem.setCreateBy(getLoginUserId());
- warehouseAreasItem.setCreateTime(new Date());
warehouseAreasItem.setUpdateBy(getLoginUserId());
- warehouseAreasItem.setUpdateTime(new Date());
if (!warehouseAreasItemService.save(warehouseAreasItem)) {
return R.error("Save Fail");
}
--
Gitblit v1.9.1