设备管理盘点功能，万利达账套，获取明细改为刷新

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jun 17 18:31:03 CST 2019
+#Thu Jul 11 15:52:58 CST 2019
 debugName=972
-versionName=686
+versionName=687
 debugCode=972
-versionCode=241
+versionCode=242

app_core/common/src/main/java/com/core/model/Approval.java

@@ -154,8 +154,8 @@ public class Approval {
                 int floatcolumn = floatcolumn();//保留小数后几位
                 LogUtil.i("gong", values + "=" + floatcolumn);
                 if (floatcolumn == 0) {
-                    if (v2.length() - 1 > 2) {
-                        builder.append(v2.substring(0, 2));
+                    if (v2.length() - 1 > 3) {
+                        builder.append(v2.substring(0, 3));
                     } else {
                         builder.append(v2);
                     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceCycleCountInfoActivity.java

@@ -13,6 +13,7 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -59,6 +60,7 @@ public class DeviceCycleCountInfoActivity extends SupportToolBarActivity impleme
     private TextView centerTv;
     private TextView lineTv;
     private TextView kindTv;
+    private Button mObtainButton;
     private RecyclerView gridList;
     private SimpleRefreshLayout mSimpleRefreshLayout;
     private int page;
@@ -132,7 +134,13 @@ public class DeviceCycleCountInfoActivity extends SupportToolBarActivity impleme
         findViewById(R.id.actionqtyTv).setOnClickListener(this);
         findViewById(R.id.unactionqtyTv).setOnClickListener(this);
         findViewById(R.id.cycleBtn).setOnClickListener(this);
-        findViewById(R.id.deviceAttributeBtn).setOnClickListener(this);
+        mObtainButton = findViewById(R.id.deviceAttributeBtn);
+        if ("N_MALATA_ZZ".equals(CommonUtil.getMaster()) || "N_MALATA_ZZ_ZS".equals(CommonUtil.getMaster())) {
+            mObtainButton.setText("刷新");
+        } else {
+            mObtainButton.setText("获取明细");
+        }
+        mObtainButton.setOnClickListener(this);
         findViewById(R.id.lossDeviceBtn).setOnClickListener(this);
         mSimpleRefreshLayout.setEnabledPullUp(true);
         mSimpleRefreshLayout.setEnablePullDown(false);
@@ -468,7 +476,12 @@ public class DeviceCycleCountInfoActivity extends SupportToolBarActivity impleme
                 mPopupWindow.dismiss();
             }
         } else if (R.id.deviceAttributeBtn == id) {
-            deviceAttribute();
+            if ("N_MALATA_ZZ".equals(CommonUtil.getMaster()) || "N_MALATA_ZZ_ZS".equals(CommonUtil.getMaster())) {
+                loadData(true);
+                loadGridData(page = 1);
+            } else {
+                deviceAttribute();
+            }
         } else if (R.id.lossDeviceBtn == id) {
             lossDevice();
         }