From fc464a48c95cc0710d89501d9df99312c3efa603 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 13 八月 2024 18:35:12 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index c20a0d4..c355fac 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -1,6 +1,8 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.fastjson.JSON;
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.domain.entity.Parameter;
import com.zy.asrs.common.domain.entity.Shelves;
@@ -20,6 +22,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+
+import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
public class LocMastController extends BaseController {
@@ -45,23 +49,39 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocMast::getLocNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(LocMast::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(LocMast::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("loc_no"))) {
- wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
- }
- if (!Cools.isEmpty(param.get("loc_sts"))) {
- wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
- }
+ excludeTrash(param);
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id",getHostId());
+ //wrapper.eq(LocMast::getHostId, getHostId());
+ convert(param, wrapper);
+ //if (!Cools.isEmpty(condition)) {
+ // wrapper.like(LocMast::getLocNo, condition);
+ //}
+ //if (!Cools.isEmpty(timeRange)) {
+ // String[] range = timeRange.split(RANGE_TIME_LINK);
+ // wrapper.ge(LocMast::getAppeTime, DateUtils.convert(range[0]));
+ // wrapper.le(LocMast::getAppeTime, DateUtils.convert(range[1]));
+ //}
+ //if (!Cools.isEmpty(param.get("loc_no"))) {
+ // wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
+ //}
+ //if (!Cools.isEmpty(param.get("loc_sts"))) {
+ // wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
+ //}
return R.ok(locMastService.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()){
+ 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(), val);
+ }
+ }
}
@PostMapping(value = "/group/empty/stock")
@@ -79,13 +99,25 @@
return R.ok();
}
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
- locMastService.updateById(locMast);
+ LocMast oldLocMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+ if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
+ locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()));
+ }
+ }
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ locMastService.update(locMast,new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
return R.ok();
}
@@ -171,6 +203,7 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMast.setHostId(hostId);
+ locMast.setWhsType(0L);
list.add(locMast);
}
}
@@ -193,10 +226,16 @@
return R.error();
}
- String pic = locMast.getPic();
ArrayList<String> list = new ArrayList<>();
- list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
- list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ String picStr = locMast.getPic();
+ if (Cools.isEmpty(picStr)) {
+ return R.ok().add(list);
+ }
+ List<String> pics = JSON.parseArray(picStr, String.class);
+ for (String pic : pics) {
+ list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
+ list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ }
return R.ok().add(list);
}
--
Gitblit v1.9.1