diff --git a/app/build.gradle b/app/build.gradle index 4aec6c4..96b65ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.aucma_mes" minSdk 24 targetSdk 33 - versionCode 5 - versionName "1.0" + versionCode 8 + versionName "1.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/aucma_mes/BindingActivity.java b/app/src/main/java/com/example/aucma_mes/BindingActivity.java index 4758a7a..ade6c90 100644 --- a/app/src/main/java/com/example/aucma_mes/BindingActivity.java +++ b/app/src/main/java/com/example/aucma_mes/BindingActivity.java @@ -67,7 +67,7 @@ public class BindingActivity extends BaseActivity { OkGo.post(url + s).tag(this).headers("Authorization", SharedPreferencesUtils.getstring("token", "")) .params("boxCode", boxCode.get()) .params("innerCode", innerCode.get()) - .params("loginName", SharedPreferencesUtils.getstring("pdaName", "")) + .params("loginName", SharedPreferencesUtils.getstring("loginName", "")) .execute(new StringCallback() { @Override public void onSuccess(Response response) { diff --git a/app/src/main/java/com/example/aucma_mes/CheckActivity.java b/app/src/main/java/com/example/aucma_mes/CheckActivity.java index bf93caa..f17ae3d 100644 --- a/app/src/main/java/com/example/aucma_mes/CheckActivity.java +++ b/app/src/main/java/com/example/aucma_mes/CheckActivity.java @@ -22,6 +22,7 @@ import com.example.aucma_mes.adapter.RepaitSubmintInfoAdapter; import com.example.aucma_mes.base.BaseActivity; import com.example.aucma_mes.databinding.ActivityCheckBinding; import com.example.aucma_mes.dialog.RepairSubmintInfoDialog; +import com.example.aucma_mes.entity.CheckSum; import com.example.aucma_mes.entity.DefectBeen; import com.example.aucma_mes.entity.DictBeen; import com.example.aucma_mes.entity.Result; @@ -52,10 +53,24 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte private List> options2; private List>> options3; private List topDefects; - + private String stationCode; + private CheckSum checkSum; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + initView(); + Intent intent = getIntent(); + stationCode = intent.getStringExtra("stationCode"); + // 查询检测 + initStationSum(); + checkViewModel.setStationCode(stationCode); + binding.setTitle("质量检测 - " + intent.getStringExtra("stationName")); + // 三联 + initOptionpb(stationCode); + tipDialog = new RepairSubmintInfoDialog(this, this); + } + + private void initView() { binding = DataBindingUtil.setContentView(this, R.layout.activity_check); checkViewModel = new CheckViewModel(); getSupportActionBar().hide(); @@ -64,13 +79,28 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte submitList = new ArrayList<>(); checkAdapter.setList(submitList); binding.recyclerView.setAdapter(checkAdapter); - Intent intent = getIntent(); - String stationCode = intent.getStringExtra("stationCode"); - checkViewModel.setStationCode(stationCode); - binding.setTitle("质量检测 - "+ intent.getStringExtra("stationName")); - // 三联 - initOptionpb(stationCode); - tipDialog = new RepairSubmintInfoDialog(this, this); + checkSum=new CheckSum(); + binding.setSum(checkSum); + } + + private void initStationSum() { + OkGo.post(url + "/api/pdaQueryQuantityNumber").tag(this) + .headers("Authorization", SharedPreferencesUtils.getstring("token", "")) + .params("stationCode", stationCode).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + Result result = response.body(); + if (result.getCode() == 200) { + var data = result.getData(); + if (data !=null){ + CheckSum checkSum1= gson.fromJson(data.toString(),CheckSum.class); + checkSum.setQUANTITY_SUM(checkSum1.getQUANTITY_SUM()); + checkSum.setREPAIR_SUM(checkSum1.getREPAIR_SUM()); + } + } + } + }); } // 扫码 @@ -121,29 +151,29 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return; checkViewModel.setList(submitList); checkViewModel.setMeasure(submitList.isEmpty() ? "3" : "1"); - checkViewModel.setUserName(SharedPreferencesUtils.getstring("pdaName", "pda01")); - checkViewModel.setTeamCode(SharedPreferencesUtils.getstring("teamCode",null)); + checkViewModel.setUserName(SharedPreferencesUtils.getstring("loginName", "pda01")); + checkViewModel.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); OkGo.post(url + "/api/checkSubmit").tag(this) .headers("Authorization", SharedPreferencesUtils.getstring("token", "")) .upRequestBody(RequestBody.create(JSON, gson.toJson(checkViewModel))) .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - Result result = response.body(); - if (result.getCode() == 200) { - Toast.makeText(CheckActivity.this, "提交成功", Toast.LENGTH_SHORT).show(); - checkViewModel.setCode(null); - checkViewModel.setName(null); - checkViewModel.setDefect(null); - checkViewModel.setButtonVisbleState(false); - submitList.clear(); - checkAdapter.notifyDataSetChanged(); - } else { - Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); - } - } - }); + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + Result result = response.body(); + if (result.getCode() == 200) { + Toast.makeText(CheckActivity.this, "提交成功", Toast.LENGTH_SHORT).show(); + checkViewModel.setCode(null); + checkViewModel.setName(null); + checkViewModel.setDefect(null); + checkViewModel.setButtonVisbleState(false); + submitList.clear(); + checkAdapter.notifyDataSetChanged(); + } else { + Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); + } + } + }); } // 删除缺陷 @@ -159,55 +189,55 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte opv = new OptionsPickerBuilder(this, this).build(); OkGo.get(url + "/base/qualityInspectionItem/getQualityDefects/" + stationCode).tag(this) .headers("Authorization", SharedPreferencesUtils.getstring("token", "")).execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - Result body = response.body(); - Log.e("TAG", "onSuccess:" + body.toString()); - if (body.getCode() == 200) { - Toast.makeText(CheckActivity.this, "请求成功", Toast.LENGTH_SHORT).show(); - list = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { - }.getType()); - if (list == null || list.isEmpty()) { - Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); - return; + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + Result body = response.body(); + Log.e("TAG", "onSuccess:" + body.toString()); + if (body.getCode() == 200) { + Toast.makeText(CheckActivity.this, "请求成功", Toast.LENGTH_SHORT).show(); + list = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { + }.getType()); + if (list == null || list.isEmpty()) { + Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); + return; + } + options1 = new ArrayList<>(); + options2 = new ArrayList<>(); + options3 = new ArrayList<>(); + list.forEach(defect -> { + String materialCategories = defect.getMaterialCategories(); + String materialSubclass = defect.getMaterialSubclass(); + String qualityDefectName = defect.getQualityDefectName(); + + if (!options1.contains(materialCategories)) { + options1.add(materialCategories); + } + int index1 = options1.indexOf(materialCategories); + if (options2.size() <= index1) { + options2.add(new ArrayList<>()); + } + if (!options2.get(index1).contains(materialSubclass)) { + options2.get(index1).add(materialSubclass); + } + int index2 = options2.get(index1).indexOf(materialSubclass); + if (options3.size() <= index1) { + options3.add(new ArrayList<>()); + } + if (options3.get(index1).size() <= index2) { + options3.get(index1).add(new ArrayList<>()); + } + if (!options3.get(index1).get(index2).contains(qualityDefectName)) { + options3.get(index1).get(index2).add(qualityDefectName); + } + }); + opv.setPicker(options1, options2, options3); + } else { + Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); + } } - options1 = new ArrayList<>(); - options2 = new ArrayList<>(); - options3 = new ArrayList<>(); - list.forEach(defect -> { - String materialCategories = defect.getMaterialCategories(); - String materialSubclass = defect.getMaterialSubclass(); - String qualityDefectName = defect.getQualityDefectName(); - if (!options1.contains(materialCategories)) { - options1.add(materialCategories); - } - int index1 = options1.indexOf(materialCategories); - if (options2.size() <= index1) { - options2.add(new ArrayList<>()); - } - if (!options2.get(index1).contains(materialSubclass)) { - options2.get(index1).add(materialSubclass); - } - int index2 = options2.get(index1).indexOf(materialSubclass); - if (options3.size() <= index1) { - options3.add(new ArrayList<>()); - } - if (options3.get(index1).size() <= index2) { - options3.get(index1).add(new ArrayList<>()); - } - if (!options3.get(index1).get(index2).contains(qualityDefectName)) { - options3.get(index1).get(index2).add(qualityDefectName); - } - }); - opv.setPicker(options1, options2, options3); - } else { - Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); - } - } - - }); + }); } // 三联添加 diff --git a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java index 1434b84..2c56bff 100644 --- a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java +++ b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java @@ -40,7 +40,7 @@ public class HomePageActivity extends AppCompatActivity { try { user = infoBeen.getUser(); - user.setUsername(SharedPreferencesUtils.getstring("pdaName", "")); + user.setUsername(SharedPreferencesUtils.getstring("loginName", "")); user.setTeamName(SharedPreferencesUtils.getstring("teamName", null)); user.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); infoDialog.setInfoData(infoBeen, user); diff --git a/app/src/main/java/com/example/aucma_mes/MainActivity.java b/app/src/main/java/com/example/aucma_mes/MainActivity.java index f720439..79b7564 100644 --- a/app/src/main/java/com/example/aucma_mes/MainActivity.java +++ b/app/src/main/java/com/example/aucma_mes/MainActivity.java @@ -45,7 +45,7 @@ public class MainActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main); - String loginName = SharedPreferencesUtils.getstring("pdaName", ""); + String loginName = SharedPreferencesUtils.getstring("loginName", ""); user = new User(); user.setUsername(loginName); user.setPassword("123456"); @@ -176,7 +176,7 @@ public class MainActivity extends BaseActivity { Intent intent = new Intent(MainActivity.this, HomePageActivity.class); intent.putExtra("role", loginBack.getRoles()); intent.putExtra("info", body); - SharedPreferencesUtils.putstring("pdaName", user.username); + SharedPreferencesUtils.putstring("loginName", user.username); SharedPreferencesUtils.putstring("teamCode", user.getTeamCode()); SharedPreferencesUtils.putstring("teamName", user.getTeamName()); SharedPreferencesUtils.putstring("token", token); diff --git a/app/src/main/java/com/example/aucma_mes/RepairActivity.java b/app/src/main/java/com/example/aucma_mes/RepairActivity.java index 54ad468..211e7d6 100644 --- a/app/src/main/java/com/example/aucma_mes/RepairActivity.java +++ b/app/src/main/java/com/example/aucma_mes/RepairActivity.java @@ -97,7 +97,7 @@ public class RepairActivity extends BaseActivity { public void repairSubmit(View view) { if (submitList.isEmpty()) return; RepairSubmitInfo repairSubmitInfo =new RepairSubmitInfo(submitList, - SharedPreferencesUtils.getstring("pdaName", "pda01") + SharedPreferencesUtils.getstring("loginName", "pda01") ,repairVm.getRepairName(),repairVm.getIsFlag()); MediaType JSON = MediaType.parse("application/json; charset=utf-8"); RequestBody body = RequestBody.create(JSON,gson.toJson(repairSubmitInfo) ); diff --git a/app/src/main/java/com/example/aucma_mes/entity/CheckSum.java b/app/src/main/java/com/example/aucma_mes/entity/CheckSum.java new file mode 100644 index 0000000..38ecd11 --- /dev/null +++ b/app/src/main/java/com/example/aucma_mes/entity/CheckSum.java @@ -0,0 +1,36 @@ +package com.example.aucma_mes.entity; + +import androidx.databinding.BaseObservable; + +/** + * @author wanghao + * @date 2024/3/15 13:46 + */ +public class CheckSum extends BaseObservable { + + /** + * QUANTITY_SUM : 380 + * REPAIR_SUM : 2 + */ + + private int QUANTITY_SUM; + private int REPAIR_SUM; + + public int getQUANTITY_SUM() { + return QUANTITY_SUM; + } + + public void setQUANTITY_SUM(int QUANTITY_SUM) { + this.QUANTITY_SUM = QUANTITY_SUM; + notifyChange(); + } + + public int getREPAIR_SUM() { + return REPAIR_SUM; + } + + public void setREPAIR_SUM(int REPAIR_SUM) { + this.REPAIR_SUM = REPAIR_SUM; + notifyChange(); + } +} diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index 11bd7c6..a78bbe0 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -4,146 +4,194 @@ xmlns:tools="http://schemas.android.com/tools"> + + name="title" + type="String" /> + - + + - - - - - - - - - - - - - - - - + android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@color/grey" + android:orientation="vertical" + tools:context=".CheckActivity"> - - - - + android:textSize="20sp" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +