From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
index 34c7fb8..65b4b3c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.LocAreaTypeSts;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.entity.param.FieldSortParam;
@@ -25,6 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -41,15 +44,14 @@
@Override
public PageParam<ViewLocDetl, BaseParam> getPage(PageParam<ViewLocDetl, BaseParam> pageParam, QueryWrapper<ViewLocDetl> buildWrapper) {
PageParam<ViewLocDetl, BaseParam> result = viewLocDetlMapper.selectPage(pageParam, buildWrapper);
-
//瑙ｆ瀽鍔ㄦ�佸瓧娈�
- JSONObject data = JSON.parseObject(JSON.toJSONString(result));
- List<ViewLocDetl> records = result.getRecords();
- data.put("records", records);
- for (ViewLocDetl locDetl : records) {
- Map<String, Object> resultMap = viewLocDetlMapper.getById(locDetl.getId());
- locDetl.syncFieldMap(resultMap);
- }
+// JSONObject data = JSON.parseObject(JSON.toJSONString(result));
+// List<ViewLocDetl> records = result.getRecords();
+// data.put("records", records);
+// for (ViewLocDetl locDetl : records) {
+// Map<String, Object> resultMap = viewLocDetlMapper.getById(locDetl.getId());
+// locDetl.syncFieldMap(resultMap);
+// }
return result;
}
@@ -102,9 +104,9 @@
@Override
public List<LocDetl> queryStock(String matnr, String batch, List<FieldParam> param, List<FieldSortParam> sortParam) {
- List<Map<String, Object>> list = viewLocDetlMapper.queryStock(matnr, batch, param, sortParam);
+ List<Map<String, Object>> list = viewLocDetlMapper.queryStock(matnr, batch, param, sortParam, LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);
List<LocDetl> locDetlsSort = resortDetls(list);
- return locDetlsSort;
+ return locDetlsSort.stream().sorted(Comparator.comparing(LocDetl::getCreateTime)).collect(Collectors.toList());
}
private List<LocDetl> resortDetls(List<Map<String, Object>> list) {
@@ -155,6 +157,7 @@
for (Integer row : direction) {
Loc one = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .select(Loc::getId)
.eq(Loc::getRow1, row)
.eq(Loc::getBay1, loc.getBay1())
.eq(Loc::getLev1, loc.getLev1()));
@@ -183,7 +186,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void locDetlFreeze(LocDetlFreezeParam param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -212,31 +215,42 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void removeLocDetl(Long locId) {
List<LocDetl> locDetls = this.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, locId));
for (LocDetl locDetl : locDetls) {
boolean remove = locDetlFieldService.remove(new LambdaQueryWrapper<LocDetlField>().eq(LocDetlField::getDetlId, locDetl.getId()));
- if (!remove) {
- throw new CoolException("鎵╁睍瀛楁鍒犻櫎澶辫触");
- }
-
+// if (!remove) {
+// throw new CoolException("鎵╁睍瀛楁鍒犻櫎澶辫触");
+// }
boolean result = this.removeById(locDetl.getId());
- if (!result) {
- throw new CoolException("鏄庣粏鍒犻櫎澶辫触");
- }
+// if (!result) {
+// throw new CoolException("鏄庣粏鍒犻櫎澶辫触");
+// }
}
}
@Override
public List<LocDetl> queryFlatStock(String matnr, String batch, List<FieldParam> params) {
//鑾峰彇骞冲簱涓鍚堟潯浠剁殑搴撲綅
- List<Map<String, Object>> list = viewLocDetlMapper.queryFlatStock(matnr, batch, params);
+ List<Map<String, Object>> list = viewLocDetlMapper.queryFlatStock(matnr, batch, params, LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id);
List<LocDetl> detls = new ArrayList<>();
list.forEach(action -> {
- LocDetl locDetl = new LocDetl();
- BeanUtils.copyProperties(action, locDetl);
- detls.add(locDetl);
+ LocDetl parseObject = JSONObject.parseObject(JSON.toJSONString(action), LocDetl.class);
+ detls.add(parseObject);
});
return detls;
}
+
+ /**
+ * 鑾峰彇鎵�鏈夊簱瀛樻暟閲�
+ * @return
+ */
+ @Override
+ public R getAllStockQty() {
+ Map<String, Double> map = new HashMap<>();
+ Double allQty = this.baseMapper.getAllStock();
+ map.put("allQty", allQty);
+ return R.ok().add(map);
+ }
}
--
Gitblit v1.9.1