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