From 7ff2521610d362d58d752202b8dab7a6cf5ec2c7 Mon Sep 17 00:00:00 2001 From: yujh_java Date: Tue, 23 Sep 2025 10:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=89=A9=E6=96=99=E5=88=86?= =?UTF-8?q?=E7=B1=BB-=E5=8C=85=E8=A3=85=E8=A2=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/bnbm/datalinkup/util/PurchaseUtil.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/PurchaseUtil.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/PurchaseUtil.java index 6ec2d01..046bdd9 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/PurchaseUtil.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/PurchaseUtil.java @@ -67,18 +67,22 @@ public class PurchaseUtil { newWlmc = "重钙"; } // 包装袋 - else if ("龙牌".equals(bkgs) && (wlmc.equals("编织袋") || wlmc.equals("阀口袋") || wlmc.equals("两纸一膜") + else if ("龙牌".equals(bkgs) && jldw.contains("条") && (wlmc.equals("编织袋") || wlmc.equals("阀口袋") || wlmc.equals("两纸一膜") || wlmc.contains("三纸一膜") || wlmc.contains("包装袋") || wlmc.contains("包装"))) { newWlmc = "包装袋"; - } else if ("泰山石膏".equals(bkgs) && (wlmc.contains("编织袋") || wlmc.contains("纸袋"))) { + } else if ("泰山石膏".equals(bkgs) && ( jldw.contains("条") || jldw.contains("根")) && (wlmc.contains("编织袋") || wlmc.contains("纸袋"))) { newWlmc = "包装袋"; - } else if ("梦牌".equals(bkgs) && wlmc.contains("包装袋")) { + } else if ("梦牌".equals(bkgs) && jldw.contains("条") && wlmc.contains("包装袋") && (!wlbm.contains("000000000024499") && !wlbm.contains("102327250000199"))) { newWlmc = "包装袋"; - } else if ("北新防水".equals(bkgs) && (wlmc.contains("包装袋") || wlmc.contains("阀口袋") || wlmc.contains("口袋"))) { + } else if ("北新防水".equals(bkgs) && ( jldw.contains("条") || jldw.contains("个")) && (wlmc.contains("包装袋") || wlmc.contains("阀口袋")) + && (!wlbm.contains("60303000157001") && !wlbm.contains("60804000151117") && !wlbm.contains("60303000028798") + && !wlbm.contains("60303000028800") && !wlbm.contains("60303000028811") && !wlbm.contains("60804000151102") + && !wlbm.contains("50603010005") && !wlbm.contains("50603010006")) + ) { newWlmc = "包装袋"; - } else if ("北新涂料".equals(bkgs) && wlmc.contains("包装袋")) { + } else if ("北新涂料".equals(bkgs) && jldw.contains("只") && wlmc.contains("包装袋")) { newWlmc = "包装袋"; - } else if ("北新嘉宝莉".equals(bkgs) && (wlmc.contains("阀口袋") || wlmc.contains("腻子粉袋") || wlmc.contains("阀口纸袋") + } else if ("北新嘉宝莉".equals(bkgs) && ( jldw.contains("条") || jldw.contains("个")) && (wlmc.contains("阀口袋") || wlmc.contains("腻子粉袋") || wlmc.contains("阀口纸袋") || wlmc.equals("纸袋") || wlmc.equals("编织袋"))) { newWlmc = "包装袋"; }