From cea6f19c13314345f6234f898dcef6e339a38ae9 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: Thu, 27 Aug 2026 09:46:28 +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 | 10 +++++----- .../production/service/impl/PalletServiceImpl.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 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 581ff8d..87ca635 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,11 +182,11 @@ public class OutBoundServiceImpl implements OutBoundService { } //判断各种情况 String receiveFlag = notifySerial.getReceiveFlag(); - List shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo); - if(shopOrderSerials.isEmpty()){ - throw new RuntimeException("该序列号追踪不到生产订单序列号明细!"); - } - String deliveryFlag = shopOrderSerials.get(0); + // List shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo); + // if(shopOrderSerials.isEmpty()){ + // throw new RuntimeException("该序列号追踪不到生产订单序列号明细!"); + // } + String deliveryFlag = notifySerial.getDeliveryFlag(); //String currentDelNotifyNo = notifySerial.getDelNotifyNo(); if(!"Y".equalsIgnoreCase(receiveFlag)){ throw new RuntimeException("当前序列号未入库。"); 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 dc2d2b9..b6cf429 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,7 +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); + // List shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo); if(notifySerials.size() == 0){ throw new RuntimeException("栈板中序列号："+serialNo+",不在通知单号："+delNotifyNo+"下。请核实!"); } @@ -646,10 +646,10 @@ public class PalletServiceImpl implements PalletService { } //判断各种情况 String receiveFlag = notifySerial.getReceiveFlag(); - if(shopOrderSerials.isEmpty()){ - throw new RuntimeException("该序列号追踪不到生产订单序列号明细!"); - } - String deliveryFlag = shopOrderSerials.get(0); + // if(shopOrderSerials.isEmpty()){ + // throw new RuntimeException("该序列号追踪不到生产订单序列号明细!"); + // } + String deliveryFlag = notifySerial.getDeliveryFlag(); // String currentDelNotifyNo = notifySerial.getDelNotifyNo(); //**************2022-05-19 由于历史遗留数据 暂时关闭 后面可以开启*************************start // if(!"Y".equalsIgnoreCase(receiveFlag)){