From 427a3848187c15c924bb80a5b83110ec5cfb41d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Wed, 26 Aug 2026 16:11:06 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pda/service/impl/OutBoundServiceImpl.java | 6 +++++- .../com/letian/modules/production/dao/PalletMapper.java | 2 ++ .../modules/production/service/impl/PalletServiceImpl.java | 6 +++++- src/main/resources/mapper/production/PalletMapper.xml | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java b/src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java index af8f5d6..581ff8d 100644 --- a/src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java +++ b/src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java @@ -182,7 +182,11 @@ public class OutBoundServiceImpl implements OutBoundService { } //判断各种情况 String receiveFlag = notifySerial.getReceiveFlag(); - String deliveryFlag = notifySerial.getDeliveryFlag(); + List shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo); + if(shopOrderSerials.isEmpty()){ + throw new RuntimeException("该序列号追踪不到生产订单序列号明细!"); + } + String deliveryFlag = shopOrderSerials.get(0); //String currentDelNotifyNo = notifySerial.getDelNotifyNo(); if(!"Y".equalsIgnoreCase(receiveFlag)){ throw new RuntimeException("当前序列号未入库。"); diff --git a/src/main/java/com/letian/modules/production/dao/PalletMapper.java b/src/main/java/com/letian/modules/production/dao/PalletMapper.java index 23af8a1..0efd628 100644 --- a/src/main/java/com/letian/modules/production/dao/PalletMapper.java +++ b/src/main/java/com/letian/modules/production/dao/PalletMapper.java @@ -319,6 +319,8 @@ public interface PalletMapper { * @throw */ List getSaveData(PalletFillDetailData inData); + + List getShopOrderSerialNoDeliveyFlag(@Param("site") String site,@Param("serialNo") String serialNo); /** * @Description * @Title diff --git a/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java b/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java index ecc207e..dc2d2b9 100644 --- a/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java +++ b/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java @@ -623,6 +623,7 @@ public class PalletServiceImpl implements PalletService { String serialNo = list.get(i).getSerialNo(); String userId = inData.getUserId(); List notifySerials = outBoundDao.getNotifyserialNoByCon(site, serialNo, delNotifyNo); + List shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo); if(notifySerials.size() == 0){ throw new RuntimeException("栈板中序列号："+serialNo+",不在通知单号："+delNotifyNo+"下。请核实!"); } @@ -645,7 +646,10 @@ public class PalletServiceImpl implements PalletService { } //判断各种情况 String receiveFlag = notifySerial.getReceiveFlag(); - String deliveryFlag = notifySerial.getDeliveryFlag(); + if(shopOrderSerials.isEmpty()){ + throw new RuntimeException("该序列号追踪不到生产订单序列号明细!"); + } + String deliveryFlag = shopOrderSerials.get(0); // String currentDelNotifyNo = notifySerial.getDelNotifyNo(); //**************2022-05-19 由于历史遗留数据 暂时关闭 后面可以开启*************************start // if(!"Y".equalsIgnoreCase(receiveFlag)){ diff --git a/src/main/resources/mapper/production/PalletMapper.xml b/src/main/resources/mapper/production/PalletMapper.xml index f731d79..019c495 100644 --- a/src/main/resources/mapper/production/PalletMapper.xml +++ b/src/main/resources/mapper/production/PalletMapper.xml @@ -227,6 +227,9 @@ + insert into Pallet_FillDetail (pallet_no,PartNo,SerialNo,SubNo,BatchNo,Qty,CreateDate,CreateBy,Site)