From 07d7df1a6f22ecbb6ba14451ebb44f29a7c00a88 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 11 Apr 2024 14:42:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=20=20=E6=97=A5=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/service/impl/OutBoundServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 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 1f1488d..7cc020a 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 @@ -5,6 +5,7 @@ import com.letian.modules.production.dao.PalletMapper; import com.letian.modules.production.dao.ProcedureMapper; import com.letian.modules.production.entity.PalletFillDetailData; import com.letian.modules.production.entity.PalletListData; +import com.qiniu.util.Json; import org.apache.commons.lang.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -363,7 +364,14 @@ public class OutBoundServiceImpl implements OutBoundService { for(CoDelDetailInData coDelDetail : coDelDetails){ String tempKey = coDelDetail.getOrderNo()+"-"+coDelDetail.getItemNo(); List serialNos = salesDetailCacheMap.get(tempKey); - String serialResult = getSerialResult(serialNos); + String serialResult = ""; + if(serialNos.size()>1){ + String str=serialNos.get(serialNos.size()-1); + serialResult=serialNos.get(0)+"-"+str.substring(str.length()-4); + }else { + serialResult=serialNos.get(0); + } + coDelDetail.setDisplaySerialNo(serialResult); coDelDetail.setRemark(""); //判断数量是否是整数 @@ -375,6 +383,10 @@ public class OutBoundServiceImpl implements OutBoundService { } //批量保存发货数据 + logger.info(inData.getDelNotifyNo()+"开始保存发货数据"); + + + logger.info(JSON.toJSONString(coDelDetails)); outBoundDao.batchInsertCoDelDetail(coDelDetails); //统计生成transHeader说数据 //缓存transHeader的TransNo和warehouse的对应的数据 @@ -598,7 +610,7 @@ public class OutBoundServiceImpl implements OutBoundService { } /** - * @Title: getSerialResult + * @Title: * @Description: 处理序列号显示规则 * @author LR * @date 2019年9月23日