From 0ab29c6d89777a832e21c5d2934e3e3e1544c6d8 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 19 十月 2025 08:51:46 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index ef4582e..3ac94fd 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -11,9 +11,14 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -26,6 +31,10 @@
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -44,17 +53,21 @@
EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -69,7 +82,7 @@
@RequestMapping(value = "/waitPakin/update/auth")
@ManagerAuth
public R update(WaitPakin waitPakin){
- if (Cools.isEmpty(waitPakin) || null==waitPakin.getId()){
+ if (Cools.isEmpty(waitPakin)){
return R.error();
}
waitPakinService.updateById(waitPakin);
@@ -78,13 +91,24 @@
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
+ @Transactional
public R delete(@RequestParam String param){
List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鏁版嵁涓虹┖");
}
for (WaitPakin entity : list){
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", entity.getZpallet()));
+ if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
+ return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
+ }
waitPakinService.delete(new EntityWrapper<>(entity));
+ //璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
+ if (!Cools.isEmpty(entity.getOrderNo())) {
+ if (!orderDetlService.decrease(entity, entity.getAnfme())) {
+ return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
}
return R.ok();
}
@@ -109,8 +133,8 @@
List<Map<String, Object>> result = new ArrayList<>();
for (WaitPakin waitPakin : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakin.getId());
- map.put("value", waitPakin.getId());
+ map.put("id", waitPakin.getZpallet());
+ map.put("value", waitPakin.getZpallet());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1