From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
index e4a9178..8d63180 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
@@ -1,23 +1,34 @@
 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.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;
+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.entity.Companys;
-import com.vincent.rsf.server.manager.entity.DeliveryItem;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.entity.excel.DeliveryTemplate;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
 import com.vincent.rsf.server.manager.service.CompanysService;
 import com.vincent.rsf.server.manager.service.DeliveryItemService;
+import com.vincent.rsf.server.manager.service.impl.DeliveryServiceImpl;
 import com.vincent.rsf.server.system.controller.BaseController;
+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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -27,8 +38,6 @@
 
     @Autowired
     private DeliveryItemService deliveryItemService;
-
-
     @Autowired
     private CompanysService companysService;
 
@@ -37,8 +46,42 @@
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
-        return R.ok().add(deliveryItemService.page(pageParam, pageParam.buildWrapper(true)));
+        QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
+        return R.ok().add(deliveryItemService.page(pageParam, wrapper));
     }
+
+    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
+    @PostMapping("/deliveryItem/filters/page")
+    public R filter(@RequestBody Map<String, Object> map) {
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
+        QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
+        wrapper.apply("anfme > work_qty + qty ");
+        return R.ok().add(deliveryItemService.page(pageParam, wrapper));
+    }
+
+
+    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
+    @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+    @PostMapping("/deliveryItem/edit/page")
+    public R byPoIdspage(@RequestBody Map<String, Object> map) {
+        List<Long> poDetlIds = new ArrayList<>();
+        if (!Objects.isNull(map.get("ids"))) {
+            poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("ids")), Long.class);
+            map.remove("ids");
+        }
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
+        QueryWrapper<DeliveryItem> queryWrapper = pageParam.buildWrapper(true);
+        if (!poDetlIds.isEmpty()) {
+            queryWrapper.in("id", poDetlIds);
+        } else {
+            return R.ok();
+        }
+        return R.ok().add(deliveryItemService.page(pageParam, queryWrapper));
+    }
+
+
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
     @PostMapping("/deliveryItem/list")
@@ -111,11 +154,4 @@
         );
         return R.ok().add(vos);
     }
-
-    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
-    @PostMapping("/deliveryItem/export")
-    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(deliveryItemService.list(), DeliveryItem.class), response);
-    }
-
 }

--
Gitblit v1.9.1