1、通用表单详情页从表不显示配置

2、设备管理， 不来自设备的用料明细可删除

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jul 15 09:48:21 CST 2019
+#Tue Jul 16 09:08:29 CST 2019
 debugName=972
-versionName=699
+versionName=702
 debugCode=972
-versionCode=254
+versionCode=257

app_modular/apputils/src/main/java/com/modular/apputils/adapter/BillDetailsAdapter.java

@@ -357,8 +357,9 @@ public class BillDetailsAdapter extends RecyclerView.Adapter<BillDetailsAdapter.
                 BillGroupModel.GridTab gridTab = tabList.get(mTabPosition);
                 if (gridTab != null) {
                     List<BillGroupModel> tabGroupModels = gridTab.getBillGroupModels();
-
-                    newGroupModels.addAll(tabGroupModels);
+                    if (tabGroupModels != null) {
+                        newGroupModels.addAll(tabGroupModels);
+                    }
                 }
                 updateGroupModels(newGroupModels);
             }

app_modular/apputils/src/main/java/com/modular/apputils/presenter/BillDetailsPresenter.java

@@ -462,7 +462,9 @@ public class BillDetailsPresenter extends BaseNetPresenter implements HttpCallba
                 object = formdetail.getJSONObject(i);
                 BillGroupModel.BillModel mBillModel = getBillModelByObject(object);
                 String group = JSONUtil.getText(object, "dg_group");
-
+                if ("0".equals(group)) {
+                    continue;
+                }
                 if (modelMap.containsKey("明细" + group)) {
                     BillGroupModel mBillGroupModel = modelMap.get("明细" + group);
                     if (mBillGroupModel == null) {

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/presenter/DeviceBillDetailPresenter.java

@@ -36,10 +36,11 @@ public class DeviceBillDetailPresenter extends BillDetailsPresenter {
         String value = billModel.getValue(), enclosureId = "";
         if ((BillTypeChangeUtils.getItemViewType(billModel.getType()) == 2 || "detailAttach".equals(billModel.getRenderer()))
                 && !TextUtils.isEmpty(value)) {
-            String[] valueArr = value.split(";");
-            if (valueArr != null && valueArr.length >= 2) {
-                value = valueArr[0];
-                enclosureId = valueArr[1];
+            int lastIndex = value.lastIndexOf(";");
+            if (lastIndex != -1) {
+                String name = value.substring(0, lastIndex);
+                enclosureId = value.substring(lastIndex + 1);
+                value = name;
             }
         }
         billModel.setValue(value);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/presenter/DeviceBillInputPresenter.java

@@ -112,7 +112,7 @@ public class DeviceBillInputPresenter extends BillPresenter {
                                 String field = hideBillFields.get(i).getField();
                                 if ("dd_source".equals(field)) {
                                     String value = hideBillFields.get(i).getValue();
-                                    if (TextUtils.isEmpty(value) || "否".equals(value)) {
+                                    if (TextUtils.isEmpty(value) || "否".equals(value) || "0".equals(value)) {
                                         editable = "";
                                     } else {
                                         editable = "F";
@@ -127,7 +127,7 @@ public class DeviceBillInputPresenter extends BillPresenter {
                                     String field = showBillFields.get(i).getField();
                                     if ("dd_source".equals(field)) {
                                         String value = showBillFields.get(i).getValue();
-                                        if (TextUtils.isEmpty(value) || "否".equals(value)) {
+                                        if (TextUtils.isEmpty(value) || "否".equals(value) || "0".equals(value)) {
                                             editable = "";
                                         } else {
                                             editable = "F";