diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ac0f0e7..0588e69 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,15 @@ android:theme="@style/Theme.Jingyuanmes" android:usesCleartextTraffic="true" tools:targetApi="31"> + + + + + + + @@ -65,11 +74,11 @@ - - + + - - + + list; private CheckSelectAdapter adapter; private Intent intent1; - private String title; + private boolean activityType; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ActivityCheckSelectBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_check_select); adapter = new CheckSelectAdapter(this, this); binding.setAdapter(adapter); - var intent = getIntent(); - - title = intent.getStringExtra("title"); + var title = getIntent().getStringExtra("title"); binding.setTitle(title); - intent1 = new Intent(this, title.equals("物料质检列表")?CheckSelectDetalActivity.class:CheckSelectDetalActivity.class); + activityType = title.equals("物料质检列表"); + intent1 = new Intent(this, activityType ? CheckSelectDetalActivity.class : CheckDisposalActivity.class); + binding.checkSelectItemSelect.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + Log.e("TAG", "onItemSelected:"+position ); + } + + @Override + public void onNothingSelected(AdapterView parent) { + } + }); } @Override @@ -46,7 +59,7 @@ public class CheckSelectActivity extends BaseActivity implements ItemClickCall { super.onResume(); OkGo.get(url + "/qms/mobile/getCheckResults").tag(this) .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) - .params("checkStatus", title.equals("物料质检列表")?null:"3") + .params("checkStatus",activityType ? null : "3") .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override @@ -76,10 +89,15 @@ public class CheckSelectActivity extends BaseActivity implements ItemClickCall { var checkMode = checkResult.getCheckModeText(); var checkSample = checkResult.getCheckSample(); var materialBatch = checkResult.getMaterialBatch(); - intent1.putExtra("checkResultId",checkResultId); - intent1.putExtra("checkMode",checkMode); - intent1.putExtra("checkSample",checkSample); - intent1.putExtra("materialBatch",materialBatch); + intent1.putExtra("checkResultId", checkResultId); + intent1.putExtra("checkMode", checkMode); + intent1.putExtra("checkSample", checkSample); + intent1.putExtra("materialBatch", materialBatch); + intent1.putExtra("materialCode",checkResult.getMaterialCode()); + intent1.putExtra("materialName",checkResult.getMaterialName()); startActivity(intent1); } + + + } \ No newline at end of file diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java index 40b8aa3..3af5aa6 100644 --- a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java +++ b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java @@ -132,7 +132,17 @@ public class CheckResult extends BaseObservable { this.checkRuleId = checkRuleId; } + /** + * 1来料检验,2,半成品检验,3成品检验,4工序检验 + * @return + */ public String getCheckRuleType() { + switch (checkRuleType){ + case "1" : return "来料检验"; + case "2" : return "半成品检验"; + case "3" : return "成品检验"; + case "4" : return "工序检验"; + } return checkRuleType; } diff --git a/app/src/main/res/layout/activity_check_disposal.xml b/app/src/main/res/layout/activity_check_disposal.xml new file mode 100644 index 0000000..fc1d107 --- /dev/null +++ b/app/src/main/res/layout/activity_check_disposal.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +