From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/service/impl/MatStoreServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MatStoreServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatStoreServiceImpl.java
index 05bd433..7f17a31 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatStoreServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatStoreServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatin;
@@ -57,7 +58,9 @@
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
- StartupDto startupDtodto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, 0);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocType1((short) 1);
+ StartupDto startupDtodto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(),false, matNos,locTypeDto, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -88,7 +91,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getBillNo(),elem.getSeqNo(),elem.getMatNo(), elem.getCount()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(),elem.getSeqNo(),elem.getMatNo(), elem.getSupplier(), elem.getCount()));
});
for (MatCodeCountDto dto : matDtos) {
MatCode matCode = matCodeService.selectById(dto.getMatNo());
--
Gitblit v1.9.1