From d3eb9f86c5b223c2bb587043a7b76492383151b1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 十二月 2024 14:47:42 +0800
Subject: [PATCH] #订单出库匹配供应商

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4746bab..30e4e23 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -95,7 +95,7 @@
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
         List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
 //        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), matnrs.get(0), null, null,locTypeDto);
+        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), matnrs.get(0), null, null,locTypeDto,matnrs.size()>1);
         if (Cools.isEmpty(dto)){
             throw new CoolException("鏌ヨ搴撲綅澶辫触锛侊紒==銆媠tartupFullPutStore ==銆� commonService.getLocNo");
         }
@@ -376,7 +376,7 @@
                 inventoryCheckOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx());
                 inventoryCheckOrderDetl.setBatch(detlDto.getLocDetl().getBatch());
                 inventoryCheckOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo());
-                inventoryCheckOrderDetl.setArea(wrkMast.getCrnNo$());
+                inventoryCheckOrderDetl.setArea(detlDto.getLocDetl().getOrigin());
                 inventoryCheckOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme());
                 inventoryCheckOrderDetl.setIoTime(now);
                 inventoryCheckOrderDetl.setStatus("1");
@@ -505,7 +505,7 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto);
+        StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto,false);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�

--
Gitblit v1.9.1