From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
index d86e811..93bd2f2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
@@ -3,16 +3,21 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.domain.dto.SafeStoDo;
+import com.zy.asrs.common.domain.dto.SafeStoDto;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.Prior;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.common.wms.service.PriorService;
import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.common.*;
import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
+import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -22,6 +27,10 @@
@Autowired
private PriorService priorService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@RequestMapping(value = "/prior/{id}/auth")
@ManagerAuth
@@ -115,7 +124,57 @@
if (hostId != null) {
param.put("host_id", hostId);
}
- return R.ok(priorService.getSafeQtyPage(curr, limit, param));
+ IPage<SafeStoDo> safeQtyPage = priorService.getSafeQtyPage(curr, limit, param);
+ return R.ok(safeQtyPage);
+ }
+
+ @RequestMapping(value = "/safeSto/add/auth")
+ @ManagerAuth(memo = "娣诲姞瀹夊叏搴撳瓨")
+ public R del(@RequestBody SafeStoDto dto){
+ if (Cools.isEmpty(dto.getMatId(), dto.getSafeQua())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (dto.getSafeQua() <= 0.0D) {
+ return R.error("瀹夊叏搴撳瓨閲忓繀椤诲ぇ浜庨浂");
+ }
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getId, dto.getMatId()).eq(Mat::getHostId, getHostId()));
+ if (mat != null) {
+ Prior prior = new Prior();
+ prior.setHostId(getHostId());
+ prior.setUuid("SP" + snowflakeIdWorker.nextId());
+ prior.setMatId(mat.getId());
+ prior.setMatnr(mat.getMatnr());
+ prior.setMaktx(mat.getMaktx());
+ prior.setLocNo(dto.getLocNo());
+ prior.setSafeQua(dto.getSafeQua());
+ prior.setCreateBy(getUserId());
+ prior.setCreateTime(new Date());
+ prior.setUpdateBy(getUserId());
+ prior.setUpdateTime(new Date());
+ prior.setStatus(1);
+ prior.setMemo(dto.getMemo());
+ if (!priorService.save(prior)) {
+ throw new CoolException("鏁版嵁淇濆瓨澶辫触");
+ }
+ } else {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/safeSto/delete/auth")
+ @ManagerAuth(memo = "鍒犻櫎搴撳瓨棰勮")
+ @Transactional
+ public R del(@RequestBody List<SafeStoDto> dtos){
+ if (Cools.isEmpty(dtos)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ for (SafeStoDto dto : dtos) {
+ if (!priorService.remove(new LambdaQueryWrapper<Prior>().eq(Prior::getId, dto.getId()).eq(Prior::getHostId, getHostId()))) {
+ throw new CoolException("鍒犻櫎瀹夊叏搴撳瓨澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ }
+ return R.ok();
}
}
--
Gitblit v1.9.1