From 7617f61de4a39a8dfc5ad02e954292d73a7aa4dc Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 23 七月 2024 14:05:38 +0800
Subject: [PATCH] 修复入库通知档无法搜索，无法删除的bug
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
index 3a6387c..9e112f6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
@@ -3,10 +3,14 @@
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.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.WaitPakin;
+import com.zy.asrs.common.wms.entity.WrkMast;
+import com.zy.asrs.common.wms.service.OrderDetlService;
import com.zy.asrs.common.wms.service.WaitPakinService;
+import com.zy.asrs.common.wms.service.WrkMastService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -14,6 +18,7 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.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.*;
@@ -23,6 +28,10 @@
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@RequestMapping(value = "/waitPakin/forBarcode/auth")
@ManagerAuth
@@ -46,17 +55,38 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WaitPakin::getHostId, getHostId());
+ QueryWrapper<WaitPakin> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id", getHostId());
if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakin::getId, condition);
+ wrapper.like("id", condition);
}
+ convert(param,wrapper);
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WaitPakin::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WaitPakin::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge("appe_time", DateUtils.convert(range[0]));
+ wrapper.le("appe_time", DateUtils.convert(range[1]));
}
return R.ok(waitPakinService.page(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ if(Cools.eq(entry.getKey(),"curr") || Cools.eq(entry.getKey(),"limit")){
+ continue;
+ }
+ 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 {
+ if (entry.getKey().equals("locNo")) {
+ wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ } else {
+ wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ }
+ }
+ }
}
@@ -78,11 +108,35 @@
return R.ok();
}
+// @RequestMapping(value = "/waitPakin/delete/auth")
+// @ManagerAuth
+// public R delete(@RequestParam(value="ids[]") Long[] ids){
+// for (Long id : ids){
+// waitPakinService.removeById(id);
+// }
+// return R.ok();
+// }
+
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- waitPakinService.removeById(id);
+ @Transactional
+ public R delete(@RequestParam String param){
+ List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
+ if (Cools.isEmpty(list)){
+ return R.error("鏁版嵁涓虹┖");
+ }
+ for (WaitPakin entity : list){
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("barcode", entity.getZpallet()));
+ if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
+ return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
+ }
+ waitPakinService.removeById(entity.getId());
+ //璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
+ if (!Cools.isEmpty(entity.getOrderNo())) {
+ if (!orderDetlService.decrease(entity.getOrderNo(),entity.getHostId(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
+ return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
}
return R.ok();
}
--
Gitblit v1.9.1