From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 18 一月 2025 17:06:18 +0800
Subject: [PATCH] # 6. 大屏添加作业类型 (全盘，还是分拣 IOType) 10.平库出库时，当前平库ID是写死在Sql里，需修改 11.平库出库没有判断是否预约出库，且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细，可以再次拣货，拣货明细需添加一个拣货状态 47. 确认发货前，需判断是否已绑定至集货区 48. CTU出库后，库位103不再删除原有库位信息
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 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 7bd6947..6e726af 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;
@@ -113,7 +115,6 @@
LocDetl locDetl = JSON.parseObject(JSON.toJSONString(map), LocDetl.class);
locDetls.add(locDetl);
}
-
locDetls = parseLocDetl(locDetls);
List<Long> sortDirctLoc = new ArrayList<>();
@@ -133,7 +134,7 @@
if (loc == null) {
continue;
}
-
+ //褰撳墠搴撲綅鐘舵�佹槸鍚﹀湪搴�
if(!loc.getLocStsId().equals(LocStsType.F.val())){
continue;
}
@@ -183,7 +184,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void locDetlFreeze(LocDetlFreezeParam param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -226,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