From 2204509d2d0d8d86c50cd6d637524583407361c7 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Tue, 13 May 2025 16:23:23 +0800 Subject: [PATCH] =?UTF-8?q?RFID=E5=92=8CRF=E7=AE=B1=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=93=81=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modules/ecss/service/impl/CoDelServiceImpl.java | 7 +++++-- 1 file 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 5c2663c8..3411f0a2 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 @@ -1660,8 +1660,11 @@ public class CoDelServiceImpl implements CoDelService { +" "+"纯FSC纸重量："+ fscWeight(partNoAndItemNoMap,partNo, totalQty, nodifyData.getLossratio()); } - String hsCodeDesc = "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N") - ?eorder.get("hsCodeDescEn") :eorder.get("hsCodeDesc")); + String hsCodeDesc = ""; + if (notifyHeader.getBuNo().equals("04-MHM") || notifyHeader.getBuNo().equals("02-Hardtag")) { + hsCodeDesc = "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N") + ?eorder.get("hsCodeDescEn") :eorder.get("hsCodeDesc")); + } eorder.put("artNo", eorder.get("part_description") + "\n" + "PO：" + eorder.get("customerPO") + " HS Code：" + eorder.get("hsCode")+ hsCodeDesc + lossratio + (data.getUpc()!=null && data.getUpc()?"\n" + "UPC:"+ eorder.get("upc"):"")