1

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<Detail> 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<Data> aa=  dataList.stream().filter(a -> a.getInvCode().equals(INVCode) && a.getExtensionID().equals(ExtensionId)).collect(Collectors.toList());
+                List<Data> aa=  dataList.stream().filter(a -> a.getInvCode().equals(INVCode)
+//                        && a.getExtensionID().equals(ExtensionId)
+                ).collect(Collectors.toList());
                 tempArr.add(barCode.getText().toString().trim());
 //            List<Detail> bb=  dataDetailList.stream().filter(a -> a.getInvCode().equals(InvCode)).collect(Collectors.toList());
                 for (int j = 0; j < aa.size(); j++) {