|
@@ -225,6 +225,8 @@ public class CheckCollectModifyActivity extends Activity {
|
|
|
private ProductClassifyAdapter adapterCheckGrinding;// 修磨适配器
|
|
private ProductClassifyAdapter adapterCheckGrinding;// 修磨适配器
|
|
|
private static String Mout_ReworkProcedureId = "";
|
|
private static String Mout_ReworkProcedureId = "";
|
|
|
private static String refireflag = "";
|
|
private static String refireflag = "";
|
|
|
|
|
+// 251225 装配回线 测试库 162 正式库169 画面 所有的都不能输入 包括 记录工序按钮
|
|
|
|
|
+ private int constProId = 169;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
@@ -285,6 +287,7 @@ public class CheckCollectModifyActivity extends Activity {
|
|
|
if (proId == 123 || proId == 157) { // 修模 养水 进
|
|
if (proId == 123 || proId == 157) { // 修模 养水 进
|
|
|
classifySpin.setEnabled(false);
|
|
classifySpin.setEnabled(false);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
check_nourishing_water_position.setEnabled(false);
|
|
check_nourishing_water_position.setEnabled(false);
|
|
|
check_water_test_position.setEnabled(false);
|
|
check_water_test_position.setEnabled(false);
|
|
|
AllListeners();
|
|
AllListeners();
|
|
@@ -2845,6 +2848,12 @@ public class CheckCollectModifyActivity extends Activity {
|
|
|
if (!(activity.proId == 123 || activity.proId == 157)) { // 养水 3#修模
|
|
if (!(activity.proId == 123 || activity.proId == 157)) { // 养水 3#修模
|
|
|
activity.classifySpin.setEnabled(true);
|
|
activity.classifySpin.setEnabled(true);
|
|
|
}
|
|
}
|
|
|
|
|
+ //251225 装配回线 测试库 162 正式库169 画面 所有的都不能输入 包括 记录工序按钮
|
|
|
|
|
+ if (activity.proId == activity.constProId ) {
|
|
|
|
|
+ activity.classifySpin.setEnabled(false);
|
|
|
|
|
+ activity.bugnotxt.setEnabled(false);
|
|
|
|
|
+ activity.loctxt.setEnabled(false);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// endTime=System.currentTimeMillis();
|
|
// endTime=System.currentTimeMillis();
|
|
@@ -2867,6 +2876,10 @@ public class CheckCollectModifyActivity extends Activity {
|
|
|
@Override
|
|
@Override
|
|
|
public void onRightItemClick(View v, int position) {
|
|
public void onRightItemClick(View v, int position) {
|
|
|
if (!activity.overdueFlag) {
|
|
if (!activity.overdueFlag) {
|
|
|
|
|
+ //251225 装配回线 测试库 162 正式库169 画面 所有的都不能输入 包括 记录工序按钮
|
|
|
|
|
+ if (activity.proId == activity.constProId ) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
ProductDefectInfo defectInfo = activity.productBugList.get(position);
|
|
ProductDefectInfo defectInfo = activity.productBugList.get(position);
|
|
|
if (defectInfo.getDeleteFlag().equals("server")) {
|
|
if (defectInfo.getDeleteFlag().equals("server")) {
|
|
|
activity.deleteFlag = true;
|
|
activity.deleteFlag = true;
|
|
@@ -3500,6 +3513,10 @@ public class CheckCollectModifyActivity extends Activity {
|
|
|
@Override
|
|
@Override
|
|
|
public void onRightItemClick(View v, int position) {
|
|
public void onRightItemClick(View v, int position) {
|
|
|
if (!activity.overdueFlag) {
|
|
if (!activity.overdueFlag) {
|
|
|
|
|
+ //251225 装配回线 测试库 162 正式库169 画面 所有的都不能输入 包括 记录工序按钮
|
|
|
|
|
+ if (activity.proId == activity.constProId ) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
ProductDefectInfo defectInfo = activity.productBugList.get(position);
|
|
ProductDefectInfo defectInfo = activity.productBugList.get(position);
|
|
|
if (defectInfo.getDeleteFlag().equals("server")) {
|
|
if (defectInfo.getDeleteFlag().equals("server")) {
|
|
|
activity.deleteFlag = true;
|
|
activity.deleteFlag = true;
|
|
@@ -5937,6 +5954,10 @@ public class CheckCollectModifyActivity extends Activity {
|
|
|
@Override
|
|
@Override
|
|
|
public void onRightItemClick(View v, int position) {
|
|
public void onRightItemClick(View v, int position) {
|
|
|
if (!overdueFlag) {
|
|
if (!overdueFlag) {
|
|
|
|
|
+ //251225 装配回线 测试库 162 正式库169 画面 所有的都不能输入 包括 记录工序按钮
|
|
|
|
|
+ if (proId == constProId ) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
ProductDefectInfo defectInfo = productBugList.get(position);
|
|
ProductDefectInfo defectInfo = productBugList.get(position);
|
|
|
if (defectInfo.getDeleteFlag().equals("server")) {
|
|
if (defectInfo.getDeleteFlag().equals("server")) {
|
|
|
deleteFlag = true;
|
|
deleteFlag = true;
|