From 501c4a802b4f5a373dd77182afbad82661622a21 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期六, 21 六月 2025 16:29:43 +0800
Subject: [PATCH] 播种拍灯
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 afeaed7..666a234 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -19,6 +20,7 @@
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.PageParam;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -101,7 +103,7 @@
@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;
}
@@ -132,7 +134,7 @@
if (loc == null) {
continue;
}
-
+ //褰撳墠搴撲綅鐘舵�佹槸鍚﹀湪搴�
if(!loc.getLocStsId().equals(LocStsType.F.val())){
continue;
}
@@ -182,7 +184,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void locDetlFreeze(LocDetlFreezeParam param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -225,4 +227,16 @@
}
}
}
+
+ @Override
+ public List<LocDetl> queryFlatStock(String matnr, String batch, List<FieldParam> 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 parseObject = JSONObject.parseObject(JSON.toJSONString(action), LocDetl.class);
+ detls.add(parseObject);
+ });
+ return detls;
+ }
}
--
Gitblit v1.9.1