瀏覽代碼

出库界面,采集成功提示修改

ChengJH 3 年之前
父節點
當前提交
00f5893ecc

+ 17 - 0
app/src/main/java/com/uas/uas_mes_standard/fragment/IOCOutMakeMaterialOper.java

@@ -420,6 +420,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private TextView mCollectResultTextView;
     private TextView mCollectBarProdcodeTv;
     private CheckBox special_check;
+    private TextView text_finishno;
 
     @Override
     protected int getLayout() {
@@ -453,6 +454,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         mCollectResultTextView = root.findViewById(R.id.iocout_collect_result);
         special_check = root.findViewById(R.id.special_check);
 
+        text_finishno = root.findViewById(R.id.text_finishno);
+
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.out_material_collect));
 //        ((FunctionActivity) getActivity()).fragment = new IOCOutMakeMaterialOper();
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
@@ -871,6 +874,13 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 //                                            + ";数量:" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
 //                                }
 //                            }
+                            String finishno = JsonUtils.optStringNotNull(dataObject, "finishno");
+                            if (!finishno.isEmpty()){
+                                text_finishno.setVisibility(View.VISIBLE);
+                                text_finishno.setText(finishno);
+                            }else {
+                                text_finishno.setVisibility(View.GONE);
+                            }
 
                             mCollectResultTextView.setText(barcodeResult);
                             mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
@@ -1639,6 +1649,13 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 //弹出拆分结果弹框
                                 initBreakPopupWindow(listArray);
                             }
+                            String finishno = JsonUtils.optStringNotNull(dataObject, "finishno");
+                            if (!finishno.isEmpty()){
+                                text_finishno.setVisibility(View.VISIBLE);
+                                text_finishno.setText(finishno);
+                            }else {
+                                text_finishno.setVisibility(View.GONE);
+                            }
 
                             mCollectResultTextView.setText(barcodeResult);
                             mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));

+ 10 - 0
app/src/main/res/layout/fragment_iocout_make_material_oper.xml

@@ -346,6 +346,16 @@
                     android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
                     tools:text="物料:PD_PRODCODE, 名称规格:PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数:PR_ZXBZS,仓位:BAR_LOCATION,有PD_BATCHCODE 则显示批号:PD_BATCHCODE" />
+                <TextView
+                    android:visibility="gone"
+                    android:id="@+id/text_finishno"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/spacing_big"
+                    android:background="@drawable/shape_msg_block"
+                    android:padding="10dp"
+                    tools:text="" />
+
             </LinearLayout>
 
         </ScrollView>