高登转品质单

WeiChat/src/main/res/layout/activity_data_form_detail.xml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/sv_top"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-   >
-
-    <LinearLayout
-        android:id="@+id/ll_top"
-       
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.core.widget.view.ListViewInScroller
-            android:id="@+id/lv_datas"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:divider="@color/item_line"
-            android:dividerHeight="0.1dp"
-            android:listSelector="@color/transparent" />
-
-        <LinearLayout
-            android:id="@+id/ll_item_add"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/selector_me_menu_item_bg"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:background="@color/item_line" />
-
-            <TextView
-                android:id="@+id/tv_item_add"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="+ 新增明细"
-                android:textColor="@color/titleBlue" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/click_btn"
-            android:layout_below="@+id/info"
-            style="@style/commonButtonStyle"
-            android:layout_marginBottom="80dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginTop="20dp"
-            android:text="提交"
-            android:visibility="gone"
-             />
-
-        <Button
-            android:id="@+id/btn_update"
-            style="@style/commonButtonStyle"
-            android:layout_below="@+id/info"
-            android:layout_marginBottom="80dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginTop="20dp"
-            android:text="更新"
-            android:visibility="gone" />
-    </LinearLayout>
-</ScrollView>
-
-

app_core/common/src/main/res/layout/activity_data_form_detail.xml

@@ -8,7 +8,7 @@
 
     <LinearLayout
         android:id="@+id/ll_top"
-       
+
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -45,37 +45,52 @@
         </LinearLayout>
 
         <Button
-            android:id="@+id/click_btn"
+            android:id="@+id/change_quality_btn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/info"
-            android:layout_marginBottom="80dp"
             android:layout_marginLeft="10dp"
+            android:layout_marginTop="20dp"
             android:layout_marginRight="10dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="转生产品质异常单"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/click_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/info"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="20dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="80dp"
             android:background="@drawable/bg_bule_btn"
             android:padding="10dp"
             android:text="提交"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main"
-            android:visibility="gone"
-             />
+            android:visibility="gone" />
 
         <Button
             android:id="@+id/btn_update"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/info"
-            android:layout_marginBottom="80dp"
             android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginTop="20dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="80dp"
             android:background="@drawable/bg_bule_btn"
             android:padding="10dp"
             android:text="更新"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main"
             android:visibility="gone" />
+
     </LinearLayout>
 </ScrollView>
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -90,7 +90,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     private boolean isLeave = true;
     private ListViewInScroller lv_datas;
     private TextView tv_item_add;
-    private Button click_btn;
+    private Button click_btn, change_quality_btn;
     private Button btn_update;
     private LinearLayout ll_item_add;
     private LinearLayout ll_top;
@@ -220,18 +220,18 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 }
                                 String type = items.getString("fd_type");
                                 if (!TextUtils.isEmpty(type) && type.equals("D")) {
-                                    data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+//                                    data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
                                 }
                                 if (startDate.equals(items.getString("fd_field"))) {
-                                    if (StringUtil.isEmpty(data.getValue())) {
-                                        data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
-                                    }
+//                                    if (StringUtil.isEmpty(data.getValue())) {
+//                                        data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+//                                    }
                                     startDate_v = data.getValue();
                                 }
                                 if (endDate.equals(items.getString("fd_field"))) {
-                                    if (StringUtil.isEmpty(data.getValue())) {
-                                        data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
-                                    }
+//                                    if (StringUtil.isEmpty(data.getValue())) {
+//                                        data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+//                                    }
                                     endDate_v = data.getValue();
                                 }
 
@@ -536,11 +536,16 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             if (btn_update != null) btn_update.setVisibility(View.VISIBLE);
                             if (click_btn != null) click_btn.setVisibility(View.GONE);
                         }
+                        //针对高登电器的生产品质异常单的特殊处理，显示转单按钮
+                        if ("VerifyApplyDetail!FQC".equals(caller)) {
+                            change_quality_btn.setVisibility(View.VISIBLE);
+                        }
                         if (mDatas.size() == 0) {
                             click_btn.setVisibility(View.GONE);
                         }
                     } else {
                         click_btn.setVisibility(View.GONE);
+                        change_quality_btn.setVisibility(View.GONE);
                     }
 
 
@@ -770,6 +775,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         lv_datas = findViewById(R.id.lv_datas);
         tv_item_add = findViewById(R.id.tv_item_add);
         click_btn = findViewById(R.id.click_btn);
+        change_quality_btn = findViewById(R.id.change_quality_btn);
         btn_update = findViewById(R.id.btn_update);
         ll_item_add = findViewById(R.id.ll_item_add);
         ll_top = findViewById(R.id.ll_top);
@@ -779,6 +785,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         ll_item_add.setOnClickListener(this);
         click_btn.setOnClickListener(this);
         btn_update.setOnClickListener(this);
+        change_quality_btn.setOnClickListener(this);
     }
 
 
@@ -910,6 +917,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 commit();
         } else if (v.getId() == R.id.btn_update) {
             updata();
+        } else if (v.getId() == R.id.change_quality_btn) {
+            // TODO: 2019/7/17 转品质单
+
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/FormListSelectActivity.java

@@ -391,7 +391,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 it_detail.putExtra("caller", caller);
                 LogUtil.d("caller:" + caller + "  id:" + id);
 
-                if ("在录入".equals(status)) {
+                if ("在录入".equals(status) || "未审核".equals(status)) {
                     if ("FeePlease!FYBX".equals(caller)) {
                         startActivity(new Intent(mContext,
                                 ExpenseReimbursementActivity.class)