From 77140b11f195496f102b27190286a380c29e4dc9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 18 十月 2024 08:56:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 34b6159..5513387 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -527,7 +528,7 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.sync(param);
+ mat.sync(matParam);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
@@ -543,7 +544,7 @@
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
} else {
- mat.sync(param);
+ mat.sync(matParam);
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
@@ -554,6 +555,36 @@
@Override
+ public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
+ ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
+ EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
+ locDetlEntityWrapper.ge("appe_time",param.getStartTime());
+ locDetlEntityWrapper.le("appe_time",param.getEndTime());
+ List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper);
+ if (!Cools.isEmpty(locDetls)) {
+ for (LocDetl locDetl : locDetls) {
+ LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
+ if (!Cools.isEmpty(locDetl.getOrderNo())){
+ Order order = orderService.selectByNo(locDetl.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ locDetlByTimeDTO.setDate(order.getOrderTime());
+ locDetlByTimeDTO.setWarehouse(order.getItemName());
+ locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ }
+ }
+
+ locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
+ locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
+ locDetlByTimeDTO.setBatch(locDetl.getBatch());
+ locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
+ locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
+ locDetlByTimeDTOS.add(locDetlByTimeDTO);
+ }
+ }
+ return locDetlByTimeDTOS;
+ }
+
+ @Override
@Transactional
public boolean agvHaiKang(String wrkNo) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Long.parseLong(wrkNo)));
--
Gitblit v1.9.1