01

app/src/main/java/com/icssoft/icspda/activity/DispatchListReturnActivity.java

@@ -378,12 +378,12 @@ public class DispatchListReturnActivity extends AppCompatActivity {
             if (IsFinish==false){
                 try {
                     Thread.sleep(50);
-//                    if (i<100){
-//                        barWithNumber.setProgress(i);
-//                    }else {
-//                        Looper.prepare();
-//                        dialog.dismiss();
-//                    }
+                    if (i<100){
+                        barWithNumber.setProgress(i);
+                    }else {
+                        Looper.prepare();
+                        dialog.dismiss();
+                    }
                    // barWithNumber.setProgress(i);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
@@ -392,10 +392,10 @@ public class DispatchListReturnActivity extends AppCompatActivity {
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
-//                        Looper.prepare();
-//                        barWithNumber.setProgress(100);
-//                        dialog.dismiss();
-//                        IsFinish=false;
+                        Looper.prepare();
+                        barWithNumber.setProgress(100);
+                        dialog.dismiss();
+                        IsFinish=false;
                     }
                 }).start();
                 break;
@@ -713,7 +713,7 @@ public class DispatchListReturnActivity extends AppCompatActivity {
         params.put("TransType","销售退货-销售退货单");
         params.put("Workpoint", LoginActivity.user.getWorkPointCode());
 
-        for (Data data:dataList){
+        for (Detail data:dataDetailList){
             Map tempDetailMap = new HashMap();
             BigDecimal currQty = new BigDecimal(data.getQuantity());
             if (currQty.compareTo(BigDecimal.ZERO) == 1) {
@@ -986,6 +986,7 @@ public class DispatchListReturnActivity extends AppCompatActivity {
         transNo.setText("");
         barCode.setText("");
         binCode.setText("");
+        outQty.setText("");
         binCode.requestFocus();
         dataList.clear();
         tableData = new TableData<>("销售退货", dataList, columns);

app/src/main/java/com/icssoft/icspda/activity/ICSCheckInActivity.java

@@ -61,6 +61,7 @@ public class ICSCheckInActivity extends AppCompatActivity {
     private int selectRowIndex = 999;
     private String selectRowBarCode = "";
     private TableData<Data> tableData;
+
     private List<Column> columns;
     private String ErrorMsg = "";
     private HorizontalProgressBarWithNumber barWithNumber;
@@ -318,28 +319,28 @@ public class ICSCheckInActivity extends AppCompatActivity {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                Looper.prepare();
-                showJDT();
-                Looper.loop();
-                Looper.getMainLooper().quit();
+//                Looper.prepare();
+//                showJDT();
+//                Looper.loop();
+//                Looper.getMainLooper().quit();
             }
         }).start();
         for (int i = 0; i <= 100; i++) {
             if (IsFinish==false){
-                try {
-                    Thread.sleep(50);
-                    barWithNumber.setProgress(i);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+//                try {
+//                    Thread.sleep(50);
+//                    barWithNumber.setProgress(i);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
             }else {
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
-                        Looper.prepare();
-                        barWithNumber.setProgress(100);
-                        dialog.dismiss();
-                        IsFinish=false;
+//                        Looper.prepare();
+//                        barWithNumber.setProgress(100);
+//                        dialog.dismiss();
+//                        IsFinish=false;
 
                     }
                 }).start();
@@ -448,7 +449,9 @@ public class ICSCheckInActivity extends AppCompatActivity {
         params.put("TransType","盘点");
         params.put("WorkPoint", LoginActivity.user.getWorkPointCode());
         try {
+
             result = "";
+            System.out.println(params);
             result = WebServiceUtil.GetWSReturnInfo("BarCodeInformation/Get", params);
             Log.e("物料条码", "CheckLotNoForCheck: "+result );
             if (result != null && result.length() != 0){