diff --git a/app/src/main/java/com/icssoft/icspda/activity/ICSCheckInActivity.java b/app/src/main/java/com/icssoft/icspda/activity/ICSCheckInActivity.java
index 93a231b..7e0fe7e 100644
--- a/app/src/main/java/com/icssoft/icspda/activity/ICSCheckInActivity.java
+++ b/app/src/main/java/com/icssoft/icspda/activity/ICSCheckInActivity.java
@@ -46,10 +46,10 @@ public class ICSCheckInActivity extends AppCompatActivity {
     private String result;
     private ApplicationModel applicationModel;
     private List<Data> checkDatas;
-//    private ArrayList<Data> checkData;
+//  private ArrayList<Data> checkData;
     private List<Data> dataList;
     private List<Data> lotDatas;
-//    private List<Data> dataDetailList;
+//  private List<Data> dataDetailList;
     private SmartTable smartTable;
     private EditText checkNo;
     private EditText barCode;
@@ -61,7 +61,6 @@ 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;
@@ -71,6 +70,7 @@ public class ICSCheckInActivity extends AppCompatActivity {
     private List<CfreeData> cfreeDataList;
     private RadioGroup radioGroup;
     private String checkKind;
+    ArrayList<String> reLotNO = new ArrayList();//已经扫描的条码 判断是否重
     private List<String> tempArr;//数量已确认的物料条码存储到此集合中
     //endregion
 
@@ -80,7 +80,6 @@ public class ICSCheckInActivity extends AppCompatActivity {
             super.handleMessage(msg);
             switch (msg.what) {
                 case 0:
-
                     barCode.requestFocus();
                     HelpUtil.SetMsg(tvMsg, Color.BLUE, "盘点单号扫描成功!");
                     break;
@@ -100,6 +99,7 @@ public class ICSCheckInActivity extends AppCompatActivity {
                     gridBarCode();
                     checkQty.requestFocus();
                     HelpUtil.SetMsg(tvMsg, Color.BLUE, "条码扫描成功!");
+                    reLotNO.add(barCode.getText().toString().trim());
                     break;
                 case 5:
 //                    gridBarCode();
@@ -255,8 +255,9 @@ public class ICSCheckInActivity extends AppCompatActivity {
             public void onClick(View v) {
                 try {
                     if (tableData!=null){
-                        checkNo.setText("");
-                        barCode.setText("");
+                        reLotNO.clear();
+                        //checkNo.setText("");
+                        //barCode.setText("");
                         checkQty.setText("");
                         checkNo.requestFocus();
                         checkDatas.clear();
@@ -319,29 +320,34 @@ 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);
+                    if (i<100){
+                        barWithNumber.setProgress(i);
+                    }else {
+                        Looper.prepare();
+                        dialog.dismiss();
+                    }
+                    // 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();
                 break;
@@ -443,6 +449,14 @@ public class ICSCheckInActivity extends AppCompatActivity {
      * 获取物料条码信息
      */
     private void CheckLotNoForCheck() {
+
+        if(reLotNO.contains(barCode.getText().toString().trim())){
+            ErrorMsg = "重复扫描";
+            handler.sendEmptyMessage(99);
+            return;
+        }
+
+
         Map params = new HashMap();
         params.put("Code",barCode.getText().toString().trim());
         params.put("TransCode",checkNo.getText().toString().trim());
@@ -451,7 +465,7 @@ public class ICSCheckInActivity extends AppCompatActivity {
         try {
 
             result = "";
-            System.out.println(params);
+            System.out.println(new Gson().toJson(params));
             result = WebServiceUtil.GetWSReturnInfo("BarCodeInformation/Get", params);
             Log.e("物料条码", "CheckLotNoForCheck: "+result );
             if (result != null && result.length() != 0){
@@ -715,6 +729,7 @@ public class ICSCheckInActivity extends AppCompatActivity {
 
         try {
             result = "";
+            System.out.println(new Gson().toJson(params));
             result = WebServiceUtil.GetWSReturnInfo("LOTCheck/Create", params);
             Log.e("TAG", "CheckIn: " + result);
             if (result != null && result.length() != 0) {
@@ -741,6 +756,7 @@ public class ICSCheckInActivity extends AppCompatActivity {
         checkDatas.clear();
         dataList.clear();
         lotDatas.clear();
+        reLotNO.clear();
         checkKind = "";
         /*OpTransferData data = new OpTransferData();
         data.setWHCode("");
diff --git a/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java b/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java
index 8b06246..fad5757 100644
--- a/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java
+++ b/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java
@@ -138,7 +138,7 @@ public class LoginActivity extends AppCompatActivity {
 //        SharedPreUtil.saveData(this,"ip","http://192.168.1.88:3003/");
         //设置站点
         if ( SharedPreUtil.getData(this,"ip","")==null||!SharedPreUtil.getData(this,"ip","").equals("")){
-//            SharedPreUtil.saveData(this,"ip","http://192.168.1.88:3003/");
+//            SharedPreUtil.saveData(this,"ip","http://192.168.1.88:5086/");
         }
         //初始化WSDL_URL，login_account
         WebServiceUtil.WSDL_URL= (String) SharedPreUtil.getData(this,"ip","");
diff --git a/app/src/main/res/layout/activity_invtrans.xml b/app/src/main/res/layout/activity_invtrans.xml
index 74d5eb0..3b6c5f8 100644
--- a/app/src/main/res/layout/activity_invtrans.xml
+++ b/app/src/main/res/layout/activity_invtrans.xml
@@ -113,7 +113,6 @@
             android:gravity="center"
             android:orientation="horizontal"
             android:padding="2dp">
-
             <com.bin.david.form.core.SmartTable
                 android:id="@+id/table"
                 android:layout_width="match_parent"