From 41d27ea6ca94c1d5f7863d0e87e12d5d36b4b980 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Fri, 27 Jun 2025 15:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ecss/service/impl/CoDelServiceImpl.java | 3 +++ .../resources/mapper/ecss/CoDelMapper.xml | 2 +- .../mapper/ecss/EcssCommonMapper.xml | 2 +- .../declaration-all-seal-template.xlsx | Bin 380211 -> 380192 bytes .../templates/declaration-all-template.xlsx | Bin 380065 -> 380055 bytes .../templates/declaration-all2-template.xlsx | Bin 392743 -> 392922 bytes .../declaration-invoice-seal-template.xlsx | Bin 218601 -> 218611 bytes .../declaration-invoice-template.xlsx | Bin 100582 -> 100609 bytes .../declaration-invoice2-template.xlsx | Bin 100554 -> 100655 bytes 9 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 1b0ed74a..ac04d90a 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -2112,6 +2112,9 @@ public class CoDelServiceImpl implements CoDelService { @Override @Transactional public void saveOneClickPacking(EcssCoDelPalletHeaderData inData) { + if (inData.getHeight()==null) { + throw new RuntimeException("栈板高度(M)不可为空！"); + } // 发货通知单 EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(inData.getSite(), inData.getDelNo()); // 先删除已存在的装箱数据 diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 09404f26..83d9e884 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -530,7 +530,7 @@ create_by,create_date,update_by,update_date and seq_no=#{seqNo} - and itemNo=#{itemNo} + and item_no=#{itemNo} diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml index 66c68658..9bceb1f3 100644 --- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml +++ b/src/main/resources/mapper/ecss/EcssCommonMapper.xml @@ -86,7 +86,7 @@