增加物料规格3显示

app/src/main/java/com/uas/ruiziuasmes/adapter/MyaddAdapter.java

@@ -38,7 +38,8 @@ public class MyaddAdapter extends RecyclerView.Adapter<MyaddAdapter.viewHolder>
 
         viewHolder.item_makecode.setText("工单："+mList.get(position).getLOTNO());
         viewHolder.item_mouldtype.setText("数量："+mList.get(position).getQTY());
-        viewHolder.item_data.setText("产品："+mList.get(position).getMA_PRODCODE()
+        viewHolder.item_data.setText("PI号："+mList.get(position).getMA_POCODE()
+                                    +"\n产品："+mList.get(position).getMA_PRODCODE()
                                     +"\n名称："+mList.get(position).getPR_DETAIL()
                                     +"\n规格："+mList.get(position).getPR_SPEC()
                                     +"\n类型："+mList.get(position).getMA_KIND()

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

@@ -10,6 +10,7 @@ public class AddworkorderBean {
     private String PR_DETAIL;
     private String PR_SPEC;
     private String MA_KIND;
+    private String MA_POCODE;
 
     public AddworkorderBean(){}
 
@@ -18,6 +19,14 @@ public class AddworkorderBean {
         this.QTY = QTY;
     }
 
+    public String getMA_POCODE() {
+        return MA_POCODE;
+    }
+
+    public void setMA_POCODE(String MA_POCODE) {
+        this.MA_POCODE = MA_POCODE;
+    }
+
     public String getMA_KIND() {
         return MA_KIND;
     }

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

@@ -11,13 +11,24 @@ public class MaintainitemBean {
     private String MM_ONEUSEQTY;
     private String MM_QTY;
     private String mi_item;
+    private String PR_SPEC3_USER;
     private boolean isChecked;
-    public MaintainitemBean(String MM_PRODCODE, String PR_DETAIL, String PR_SPEC) {
+    public MaintainitemBean(String MM_PRODCODE, String PR_DETAIL, String PR_SPEC,String PR_SPEC3_USER) {
         this.MM_PRODCODE = MM_PRODCODE;
         this.PR_DETAIL = PR_DETAIL;
         this.PR_SPEC = PR_SPEC;
+        this.PR_SPEC3_USER = PR_SPEC3_USER;
     }
     public MaintainitemBean(){}
+
+    public String getPR_SPEC3_USER() {
+        return PR_SPEC3_USER;
+    }
+
+    public void setPR_SPEC3_USER(String PR_SPEC3_USER) {
+        this.PR_SPEC3_USER = PR_SPEC3_USER;
+    }
+
     public String getMM_PRODCODE() {
         return MM_PRODCODE;
     }

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

@@ -130,6 +130,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     private String dl_macodEdata;
     private String pr_sdetail;
     private ImageView iv_add_data;
+    private TextView tv_picode;
 
     @Override
     protected int getLayout() {
@@ -151,6 +152,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         mingchenTv = root.findViewById(R.id.mingchen_tv);
         guigeTv = root.findViewById(R.id.guige_tv);
         kind_tv = root.findViewById(R.id.kind_tv);
+        tv_picode = root.findViewById(R.id.tv_picode);
         line_mju = root.findViewById(R.id.line_mju);
         mOlIdTv = root.findViewById(R.id.ol_id_tv);
         tv_jitaihao = root.findViewById(R.id.tv_jitaihao);
@@ -437,6 +439,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                                 mingchenTv.setText(dataObject.getString("PR_DETAIL") == null ? "-" : dataObject.getString("PR_DETAIL"));
                                 guigeTv.setText(dataObject.getString("PR_SPEC") == null ? "-" :dataObject.getString("PR_SPEC")+"");
                                 kind_tv.setText(dataObject.getString("MA_KIND") == null ? "-" :dataObject.getString("MA_KIND")+"");
+                                tv_picode.setText(dataObject.getString("MA_POCODE") == null ? "-" :dataObject.getString("MA_POCODE")+"");
                             }
                         }
                     }

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

@@ -227,7 +227,8 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             bean= new MaintainitemBean(
                     data.getString("MM_PRODCODE"),
                     data.getString("PR_DETAIL"),
-                    data.getString("PR_SPEC"));
+                    data.getString("PR_SPEC"),
+                    data.getString("PR_SPEC3_USER"));
             mFeededList.add(bean);
         }
         setAdapter(mFeededList);
@@ -598,6 +599,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             ((ListItemViewHolder) holder).tv_liaocode.setText("物料编号："+mList.get(i).getMM_PRODCODE());
             ((ListItemViewHolder) holder).tv_liaotetall.setText("物料名称："+mList.get(i).getPR_DETAIL());
             ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格："+mList.get(i).getPR_SPEC());
+            ((ListItemViewHolder) holder).tv_liaospec3.setText("物料规格3："+mList.get(i).getPR_SPEC3_USER());
 
 
             ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
@@ -654,12 +656,14 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
             TextView tv_liaocode;
             TextView tv_liaotetall;
             TextView tv_liaospec;
+            TextView tv_liaospec3;
             ListItemViewHolder(View view) {
                 super(view);
                 this.tv_liaocode = (TextView) view.findViewById(R.id.tv_liaocode);
                 this.tv_liaotetall = (TextView) view.findViewById(R.id.tv_liaotetall);
                 this.tv_liaospec = (TextView) view.findViewById(R.id.tv_liaospec);
                 this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+                this.tv_liaospec3 = (TextView) view.findViewById(R.id.tv_liaospec3);
 
             }
         }

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

@@ -451,6 +451,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
             jltStorageInBean.setPR_DETAIL(dataObject.getString("PR_DETAIL"));
             jltStorageInBean.setPR_SPEC(dataObject.getString("PR_SPEC"));
             jltStorageInBean.setMA_KIND(dataObject.getString("MA_KIND"));
+            jltStorageInBean.setMA_POCODE(dataObject.getString("MA_POCODE"));
             mFilterStorageInBeans.add(jltStorageInBean);
             MyaddAdapter addadapter = new MyaddAdapter(mActivity, mFilterStorageInBeans);
             recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));

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

@@ -46,6 +46,15 @@
                 android:text="11234123ee21234er"
                 android:gravity="center">
             </TextView>
+            <TextView
+                android:id="@+id/tv_liaospec3"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="11234123ee21234er"
+                android:gravity="center">
+            </TextView>
         </LinearLayout>
 
     </LinearLayout>

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

@@ -87,6 +87,28 @@
         </LinearLayout>
 
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="3dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="PI号:"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_picode"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            android:textColor="#333"
+            android:textSize="14sp"
+            />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"

build.gradle

@@ -51,8 +51,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 18,
-            versionName      : "v1.0.8"
+            versionCode      : 19,
+            versionName      : "v1.0.9"
     ]
 
     depsVersion = [