增加工序待转入和工序待转出

app/src/main/java/com/uas/ruiziuasmes/activity/IndexActivity.java

@@ -134,7 +134,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private String ma_prodcode;
     private TextView index_pc_doc;
     private TextView tv_work_order_number,tv_reporting_for_work_number;
-
+    private TextView tv_process_transfer,tv_process_transfer_out;
 
     @Override
     protected void onDestroy() {
@@ -170,6 +170,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         index_pc_doc = findViewById(R.id.index_pc_doc);
         tv_work_order_number = findViewById(R.id.tv_work_order_number);
         tv_reporting_for_work_number = findViewById(R.id.tv_reporting_for_work_number);
+        tv_process_transfer = findViewById(R.id.tv_process_transfer);
+        tv_process_transfer_out = findViewById(R.id.tv_process_transfer_out);
 
         findViewById(R.id.index_edit).setOnClickListener(this);
         mRefreshLayout = findViewById(R.id.SmartRefreshLayout_id);
@@ -543,6 +545,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 String DL_MOULDCODE = data.getString("DL_MOULDCODE") == null ? "" : data.getString("DL_MOULDCODE");
                 String ma_kind = data.getString("MA_KIND")== null ? "" : data.getString("MA_KIND");
                 String MA_REST = data.getString("MA_REST")== null ? "" : data.getString("MA_REST");
+                String INQTY = data.getString("INQTY")== null ? "" : data.getString("INQTY");
+                String OUTQTY = data.getString("OUTQTY")== null ? "" : data.getString("OUTQTY");
                 bean.setDL_MACODE(DL_MACODE);
                 bean.setMA_PRODCODE(MA_PRODCODE);
                 bean.setMA_QTY(MA_QTY);
@@ -551,6 +555,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 bean.setDL_MOULDCODE(DL_MOULDCODE);
                 bean.setMA_KIND(ma_kind);
                 bean.setMA_REST(MA_REST);
+                bean.setINQTY(INQTY);
+                bean.setOUTQTY(OUTQTY);
                 mList.add(bean);
             }
             try {
@@ -562,6 +568,9 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 dlstr_macodes = mList.get(0).getDL_MOULDCODE();
                 ma_kind = mList.get(0).getMA_KIND();
                 ma_prodcode = mList.get(0).getMA_PRODCODE();
+                tv_process_transfer.setText(mList.get(0).getINQTY());
+                tv_process_transfer_out.setText(mList.get(0).getOUTQTY());
+
                 //            StringBuilder stringtext = new StringBuilder();
                 //            for (int i=0;i<mList.size();i++){
                 //                stringtext.append(mList.get(i).getLOTNO()).append(",");
@@ -836,13 +845,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         dlMacodeAdapter.notifyDataSetChanged();
     }
 
-
-
-
-
-
-
-
     private void getRepairStep(String trim) {
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,

app/src/main/java/com/uas/ruiziuasmes/bean/DlMacodesBean.java

@@ -12,9 +12,26 @@ public class DlMacodesBean implements Serializable {
     private String DL_MOULDCODE;
     private String MA_KIND;
     private boolean Checked;
-
+    private String INQTY;
+    private String OUTQTY;
     private String MA_REST;
 
+    public String getINQTY() {
+        return INQTY;
+    }
+
+    public void setINQTY(String INQTY) {
+        this.INQTY = INQTY;
+    }
+
+    public String getOUTQTY() {
+        return OUTQTY;
+    }
+
+    public void setOUTQTY(String OUTQTY) {
+        this.OUTQTY = OUTQTY;
+    }
+
     public String getMA_REST() {
         return MA_REST;
     }

app/src/main/java/com/uas/ruiziuasmes/fragment/PostPunchFragment.java

@@ -857,7 +857,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
 
             Window dialogWindow = mDialog.getWindow();
             if (dialogWindow != null) {
-                dialogWindow.setWindowAnimations(com.bigkoo.pickerview.R.style.picker_view_slide_anim);//修改动画样式
+                dialogWindow.setWindowAnimations(R.style.picker_view_slide_anim);//修改动画样式
                 dialogWindow.setGravity(Gravity.BOTTOM);//改成Bottom,底部显示
             }
         }

app/src/main/res/layout/activity_index.xml

@@ -291,6 +291,46 @@
                         android:layout_weight="1"/>
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="工序待转入：" />
+
+                    <TextView
+                        android:id="@+id/tv_process_transfer"
+                        android:textColor="@color/blue"
+                        style="@style/valuetext"
+                        android:layout_weight="1"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="工序待转出：" />
+
+                    <TextView
+                        android:id="@+id/tv_process_transfer_out"
+                        android:textColor="@color/blue"
+                        style="@style/valuetext"
+                        android:layout_weight="1"/>
+                </LinearLayout>
+
 
                 <LinearLayout
                     android:visibility="gone"

build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 29,
-            versionName      : "v1.1.9"
+            versionCode      : 30,
+            versionName      : "v1.2.0"
     ]
 
     depsVersion = [