From f00281e8dd4f2b5297cf430d8440ff23a2f3e628 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 14:36:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index 8a4ea71..2c8b610 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -10,15 +10,15 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.param.ReportOrderBatchDetlParam;
+import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.service.OrderDetlPakoutService;
+import com.zy.asrs.service.impl.OrderDetlPakoutServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("order/pakout")
@@ -26,6 +26,8 @@
@Autowired
private OrderDetlPakoutService orderDetlService;
+ @Autowired
+ private OrderDetlPakoutServiceImpl orderDetlPakoutService;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -44,7 +46,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy("update_time", false);
}
wrapper.eq("status", 1);
Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
@@ -135,14 +137,65 @@
return R.ok();
}
- @RequestMapping(value = "/cargo/grouping/auth")
+ @RequestMapping(value = "/orderDetl/cargo/grouping/auth")
@ManagerAuth
- public R orderDetlCargoGrouping(@RequestBody JSONObject param) {
- Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
+ public R orderDetlCargoGrouping(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ try{
+ String itemName = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("item_name")) {
+ itemName = val;
+ }
+ }
+ List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlPakoutService.selectOrderPakoutDetailVoList(itemName,modiTimeStart,modiTimeEnd, curr, limit);
+ Page<OrderPakoutDetailVo> page = new Page<OrderPakoutDetailVo>(curr, limit).setRecords(OrderPakoutDetailVoList);
+ page.setTotal(orderDetlPakoutService.selectOrderPakoutDetailVoListTotal(itemName,modiTimeStart,modiTimeEnd));
+ return R.ok(page);
+
+ } catch (Exception e) {
+ return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());
+ }
+ }
+
+ @RequestMapping(value = "/orderDetl/batch/report/auth")
+ @ManagerAuth(memo = "淇敼涓婃姤椤�")
+ public R reportBatch(ReportOrderBatchDetlParam param) {
+ List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("batch", param.getBatch())
+ );
+ for (OrderDetlPakout orderDetl : orderDetlPakoutList){
+ orderDetl.setStatus(param.getStatus());
+ orderDetlService.updateById(orderDetl);
}
return R.ok();
}
+ @RequestMapping(value = "/orderDetl/order/v1/report/auth")
+ @ManagerAuth(memo = "涓婃姤MES瀹為檯缁勮揣鍗�")
+ public R reportBatchOrder(ReportOrderBatchDetlParam param) {
+ List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("batch", param.getBatch())
+ );
+ for (OrderDetlPakout orderDetl : orderDetlPakoutList){
+ orderDetl.setStatus(param.getStatus());
+ orderDetlService.updateById(orderDetl);
+ }
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.9.1