From c38dc58c43a197970632fbd261dee61d578d2a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E9=B9=8F?= Date: Wed, 30 Aug 2023 15:16:42 +0800 Subject: [PATCH] 1 --- .../com/icssoft/icspda/activity/INVOutActivity.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/icssoft/icspda/activity/INVOutActivity.java b/app/src/main/java/com/icssoft/icspda/activity/INVOutActivity.java index 3c1ff00..9cf2595 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/INVOutActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/INVOutActivity.java @@ -418,7 +418,9 @@ public class INVOutActivity extends AppCompatActivity { if (rbIn.isChecked()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - SumPlanQty = BigDecimal.valueOf(dataList.stream().filter(a -> a.getInvCode().equals(InvCode) && a.getExtensionID().equals(ExtensionId)).collect(Collectors.toList()).stream().mapToDouble(Data::getQuantityy).sum()); + SumPlanQty = BigDecimal.valueOf(dataList.stream().filter(a -> a.getInvCode().equals(InvCode) +// && a.getExtensionID().equals(ExtensionId) + ).collect(Collectors.toList()).stream().mapToDouble(Data::getQuantityy).sum()); } System.out.println(SumPlanQty); if (new BigDecimal(outQty.getText().toString().trim()).compareTo(LotQty) == 1) {//bug @@ -597,7 +599,9 @@ public class INVOutActivity extends AppCompatActivity { private void showSMTableDialog(String InvCode, String VouchRow) { List dData = new ArrayList<>(); for (Detail detail : dataDetailList) { - if ( detail.getInvCode().equals(InvCode) && detail.getExtensionId().equals(ExtensionId)) { + if ( detail.getInvCode().equals(InvCode) +// && detail.getExtensionId().equals(ExtensionId) + ) { dData.add(detail); } } @@ -809,7 +813,9 @@ public class INVOutActivity extends AppCompatActivity { private void SetMainTableQty(BigDecimal QTY, String INVCode, String PNO, String BATCH, String WHCode) { try {//bug修该点 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) { - List aa= dataList.stream().filter(a -> a.getInvCode().equals(INVCode) && a.getExtensionID().equals(ExtensionId)).collect(Collectors.toList()); + List aa= dataList.stream().filter(a -> a.getInvCode().equals(INVCode) +// && a.getExtensionID().equals(ExtensionId) + ).collect(Collectors.toList()); tempArr.add(barCode.getText().toString().trim()); // List bb= dataDetailList.stream().filter(a -> a.getInvCode().equals(InvCode)).collect(Collectors.toList()); for (int j = 0; j < aa.size(); j++) {