|
@@ -817,6 +817,7 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
public void onClick(View v) {
|
|
public void onClick(View v) {
|
|
|
// 原来没有temporarilyFlag的逻辑
|
|
// 原来没有temporarilyFlag的逻辑
|
|
|
setbarcodeListData(arry4,"1");
|
|
setbarcodeListData(arry4,"1");
|
|
|
|
|
+ dialog.Closedialog();
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -848,7 +849,7 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
// 原来没有temporarilyFlag的逻辑
|
|
// 原来没有temporarilyFlag的逻辑
|
|
|
- setbarcodeListData(arry4,null);
|
|
|
|
|
|
|
+ setbarcodeListData(arry4,"0");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
@@ -991,9 +992,7 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
info.setGroutingDate(groutingDate);
|
|
info.setGroutingDate(groutingDate);
|
|
|
info.setDeliverTime(diliverTime);
|
|
info.setDeliverTime(diliverTime);
|
|
|
// temporarilyFlag 的值暂时用remark替代
|
|
// temporarilyFlag 的值暂时用remark替代
|
|
|
- if (!TextUtils.isEmpty(temporarilyFlag)) {
|
|
|
|
|
- info.setRemarks("1");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ info.setRemarks(temporarilyFlag);
|
|
|
info.setBanMa((jobj5.optString("BANMA") == "null") ? "" : jobj5.optString("BANMA"));
|
|
info.setBanMa((jobj5.optString("BANMA") == "null") ? "" : jobj5.optString("BANMA"));
|
|
|
|
|
|
|
|
barcodeInfoList.add(info);
|
|
barcodeInfoList.add(info);
|
|
@@ -1020,6 +1019,8 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
} });
|
|
} });
|
|
|
|
|
+
|
|
|
|
|
+ saveBtn.setText("保存(" + barcodeInfoList.size() + ")");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|