From ad388e75b34a2145f12cf12215566eef900b4892 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 15 六月 2024 13:00:31 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 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 861d0d2..0b03522 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,7 +1,6 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
@@ -18,9 +17,9 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import java.util.*;
@RestController
@@ -30,6 +29,9 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+
+ @Value("${wcs.url}")
+ private String WCS_URL;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -57,7 +59,16 @@
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));
+ }
+
+ @PostMapping(value = "/group/empty/stock")
+ @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
+ public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
+ return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo, getHostId()));
}
@@ -69,13 +80,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();
}
@@ -173,4 +196,27 @@
return R.ok("鍒濆鍖栨垚鍔�");
}
+ @GetMapping("/locMast/picUrl")
+ @ManagerAuth
+ public R getPicUrl(@RequestParam String locNo) {
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, locNo)
+ .eq(LocMast::getHostId, getHostId()));
+ if (locMast == null) {
+ return R.error();
+ }
+
+ ArrayList<String> list = new ArrayList<>();
+ 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