From 5bc7091e58978baea6537ca68a6afef5c22f31e7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 一月 2024 08:19:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5229cd2..20e0152 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -79,9 +79,10 @@
     private ManLocDetlService manLocDetlService;
     @Autowired
     private ManLocDetlMapper manLocDetlMapper;
-
     @Autowired
     private  DocTypeService docTypeService;
+    @Autowired
+    private MatV2Service matV2Service;
     @Override
     @Transactional
     public void comb(CombParam param, Long userId) {
@@ -136,11 +137,16 @@
 
             for (DetlDto detlDto : detlDtos) {
                 Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-                if (Cools.isEmpty(mat)) {
-                    throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
-                }
                 WaitPakin waitPakin = new WaitPakin();
-                waitPakin.sync(mat);
+                if (Cools.isEmpty(mat)) {
+                    MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+                    if(Cools.isEmpty(matV2)){
+                        throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
+                    }
+                    waitPakin.sync(matV2);
+                } else {
+                    waitPakin.sync(mat);
+                }
                 waitPakin.setBatch(detlDto.getBatch());
                 waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
                 waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��

--
Gitblit v1.9.1