diff --git a/.idea/dictionaries/wanghao.xml b/.idea/dictionaries/wanghao.xml new file mode 100644 index 0000000..bd10861 --- /dev/null +++ b/.idea/dictionaries/wanghao.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..30e75dc --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java index 549cc45..aee086c 100644 --- a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java @@ -69,7 +69,8 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { map.put("制品复检", CheckActivity.class); map.put("机台投料", FeedingMaterialsActivity.class); map.put("工装验证", FeedingMaterialsActivity.class); - // map.put("产出工装绑定", CheckActivity.class); + map.put("载具绑定", FeedingMaterialsActivity.class); + map.put("系统配置", ConfigActivity.class); map.put("班组管理", ClassItemActivity.class); } @@ -120,6 +121,8 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { if (menuName.equals("机台投料")){ intent.putExtra("from","1"); }else if (menuName.equals("工装验证")){ + intent.putExtra("from","2"); + }else if (menuName.equals("载具绑定")){ intent.putExtra("from","4"); } diff --git a/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java b/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java index b614dc6..bd1987a 100644 --- a/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java +++ b/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java @@ -66,7 +66,7 @@ public class MyApplication extends Application { OkGo.getInstance().init(this).setOkHttpClient(builder.build()) // 建议设置OkHttpClient，不设置将使用默认的 .setCacheMode(CacheMode.NO_CACHE) // 全局统一缓存模式，默认不使用缓存，可以不传 .setCacheTime(CacheEntity.CACHE_NEVER_EXPIRE) // 全局统一缓存时间，默认永不过期，可以不传 - .setRetryCount(3) + .setRetryCount(1) .addCommonHeaders(headers); diff --git a/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java b/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java index 5bf6f59..ff328d2 100644 --- a/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java @@ -82,11 +82,11 @@ public class FeedingMaterialsActivity extends BaseActivity { return; } machinePlan.setFrom(from); - if (from.equals("4")){ - machinePlan.setWorkCode(data); - }else { + // if (from.equals("4")){ + // machinePlan.setWorkCode(data); + // }else { machinePlan.setBarCode(data); - } + // } OkGo.post("http://" + SharedPreferencesUtils.getstring("machineIp", null) + "/api/semi_product/scan") @@ -99,6 +99,8 @@ public class FeedingMaterialsActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { + machinePlan = gson.fromJson(body.getDataJson(), MachinePlan.class); + binding.setData(machinePlan); binding.feedingBarCode.setText(null); // Toast.makeText(FeedingMaterialsActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); // return; diff --git a/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java b/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java index dd098ee..244c6d5 100644 --- a/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java @@ -8,25 +8,23 @@ import android.widget.Toast; import androidx.databinding.DataBindingUtil; - import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.listener.OnOptionsSelectListener; import com.bigkoo.pickerview.view.OptionsPickerView; import com.example.haiwei_mom.R; import com.example.haiwei_mom.adapter.CheckAdapter; import com.example.haiwei_mom.base.BaseActivity; - import com.example.haiwei_mom.base.MyRecultCall; import com.example.haiwei_mom.base.MyResult; import com.example.haiwei_mom.databinding.ActivityCheckBinding; import com.example.haiwei_mom.qm.data.CheckViewModel; import com.example.haiwei_mom.qm.data.DefectBeen; +import com.example.haiwei_mom.qm.data.QcTaskInfo; import com.example.haiwei_mom.uitls.SharedPreferencesUtils; import com.google.gson.reflect.TypeToken; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; - import java.util.ArrayList; import java.util.List; @@ -49,55 +47,31 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte @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() { ActivityCheckBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_check); checkViewModel = new CheckViewModel(); - binding.setVm(checkViewModel); checkAdapter = new CheckAdapter(this, this); submitList = new ArrayList<>(); checkAdapter.setList(submitList); binding.recyclerView.setAdapter(checkAdapter); - - } - - private void initStationSum() { - OkGo.post(url + "/api/pdaQueryQuantityNumber").tag(this).params("stationCode", stationCode).execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - var 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()); - } - } - } - + binding.checkGoodsCode.setOnEditorActionListener((v, actionId, event) -> { + selectGoodsInfo(v.getText().toString()); + return true; }); - } + + } @Override public void getScannerData(String code) { super.getScannerData(code); - checkViewModel.setCode(code); - OkGo.post(url + "/dev-api/api/pdaApi/getMateriallnfo" + code).tag(this) - // .params("code", code) + selectGoodsInfo(code); + + } + // 查询物料 + public void selectGoodsInfo(String code) { + OkGo.get(url + "/api/pdaApi/getMaterialInfo").tag(this) + .params("code", code) // .params("station", stationCode) .execute(new MyRecultCall(dialog, this) { @Override @@ -105,6 +79,9 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte super.onSuccess(response); var result = response.body(); if (result.getCode() == 200) { + QcTaskInfo qcTaskInfo=gson.fromJson(result.getDataJson(),QcTaskInfo.class); + checkViewModel.setName(qcTaskInfo.getMaterialName()); + initOptionpb( qcTaskInfo.getOperation()); /* checkViewModel.setName(result.getMsg()); topDefects = gson.fromJson(gson.toJson(result.getData()), new TypeToken>() { }.getType()); @@ -115,6 +92,7 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte checkViewModel.setButtonVisbleState(true);*/ // tipDialog.setList(topDefects); // tipDialog.show(); + return; } @@ -122,26 +100,24 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte } }); + } + // 弹出选择框 public void checkSelect(View view) { + if (options1==null ||list.isEmpty()) return; opv.show(); } - // 弹出返修 - // public void selectRepair(View view) { - // tipDialog.show(); - // } - public void checkSubmint1(View view) { - getScannerData("B24031483025025351528"); - } // 提交 public void checkSubmint(View view) { if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return; - checkViewModel.setList(submitList); + Toast.makeText(context, "质检完成", Toast.LENGTH_SHORT).show(); + finish(); + /* checkViewModel.setList(submitList); checkViewModel.setMeasure(submitList.isEmpty() ? "3" : "1"); checkViewModel.setUserName(SharedPreferencesUtils.getstring("loginName", "pda01")); checkViewModel.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); @@ -158,12 +134,12 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte checkViewModel.setButtonVisbleState(false); submitList.clear(); checkAdapter.notifyDataSetChanged(); - initStationSum(); + // initStationSum(); } else { Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); } } - }); + });*/ } // 删除缺陷 @@ -177,7 +153,9 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte // 初始化-联动选择 private void initOptionpb(String stationCode) { opv = new OptionsPickerBuilder(this, this).build(); - OkGo.get(url + "/base/qualityInspectionItem/getQualityDefects/" + stationCode).tag(this).execute(new MyRecultCall(dialog, this) { + OkGo.get(url + "/api/pdaApi/getDefectDetail") + // .params("defectType", "BZP_DEFECT") + .params("defectType", stationCode).execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { super.onSuccess(response); @@ -191,36 +169,38 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); return; } - options1 = new ArrayList<>(); - options2 = new ArrayList<>(); - options3 = new ArrayList<>(); + options1 = new ArrayList<>(list.size()); + // 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); - } + options1.add(defect.getDefectDesc()); + // 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); + // opv.setPicker(options1, options2, options3); + opv.setPicker(options1); } else { Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); } @@ -232,10 +212,10 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte // 三联添加 @Override public void onOptionsSelect(int options1, int options2, int options3, View v) { - String defectName = this.options3.get(options1).get(options2).get(options3); + String defectName = this.options1.get(options1); checkViewModel.setDefect(defectName); DefectBeen defectBeen = new DefectBeen(); - defectBeen.setQualityDefectName(defectName); + defectBeen.setDefectDesc(defectName); DefectBeen defectBeen1 = list.get(list.indexOf(defectBeen)); if (submitList.contains(defectBeen1)) { Toast.makeText(this, "已经添加了", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/example/haiwei_mom/qm/data/DefectBeen.java b/app/src/main/java/com/example/haiwei_mom/qm/data/DefectBeen.java index 10d4157..f46bdc5 100644 --- a/app/src/main/java/com/example/haiwei_mom/qm/data/DefectBeen.java +++ b/app/src/main/java/com/example/haiwei_mom/qm/data/DefectBeen.java @@ -10,7 +10,8 @@ import java.util.Objects; */ public class DefectBeen extends BaseObservable { - + private String defectCode; + private String defectDesc; private int index; private int objId; @@ -21,12 +22,29 @@ public class DefectBeen extends BaseObservable { private String stationCode; private String qualityDefectCode; private String qualityDefectName; - private String processResult;//返修结果 - private String productLineName;//pda 工位名称 + private String processResult;// 返修结果 + private String productLineName;// pda 工位名称 private String productLineCode; private String inspectorTime; + + public String getDefectCode() { + return defectCode; + } + + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } + + public String getDefectDesc() { + return defectDesc; + } + + public void setDefectDesc(String defectDesc) { + this.defectDesc = defectDesc; + } + public String getInspectorTime() { return inspectorTime; } @@ -51,10 +69,6 @@ public class DefectBeen extends BaseObservable { this.productLineName = productLineName; } - public void setIndex(int index) { - this.index = index; - } - public String getStationCode() { return stationCode; } @@ -78,12 +92,12 @@ public class DefectBeen extends BaseObservable { DefectBeen that = (DefectBeen) o; - return Objects.equals(qualityDefectName, that.qualityDefectName); + return Objects.equals(defectDesc, that.defectDesc); } @Override public int hashCode() { - return qualityDefectName != null ? qualityDefectName.hashCode() : 0; + return defectDesc != null ? defectDesc.hashCode() : 0; } public int getObjId() { @@ -98,6 +112,10 @@ public class DefectBeen extends BaseObservable { return index; } + public void setIndex(int index) { + this.index = index; + } + public String getMaterialCategories() { return materialCategories; } @@ -115,7 +133,8 @@ public class DefectBeen extends BaseObservable { } public String getQualityDefectCode() { - return qualityDefectCode; + return defectCode; + // return qualityDefectCode; } public void setQualityDefectCode(String qualityDefectCode) { @@ -123,7 +142,8 @@ public class DefectBeen extends BaseObservable { } public String getQualityDefectName() { - return qualityDefectName; + // return qualityDefectName; + return getDefectDesc(); } public void setQualityDefectName(String qualityDefectName) { diff --git a/app/src/main/java/com/example/haiwei_mom/qm/data/QcTaskInfo.java b/app/src/main/java/com/example/haiwei_mom/qm/data/QcTaskInfo.java new file mode 100644 index 0000000..d1ad852 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/qm/data/QcTaskInfo.java @@ -0,0 +1,41 @@ +package com.example.haiwei_mom.qm.data; + + +public class QcTaskInfo { + private String taskId; + private Long materialId; + private String materialName; + private String operation; + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public Long getMaterialId() { + return materialId; + } + + public void setMaterialId(Long materialId) { + this.materialId = materialId; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java index cf12063..59d6686 100644 --- a/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java @@ -9,6 +9,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; +import android.widget.Toast; import com.example.haiwei_mom.R; import com.example.haiwei_mom.base.BaseActivity; @@ -30,14 +31,17 @@ public class SemiInActivity extends BaseActivity implements View.OnFocusChangeLi @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = DataBindingUtil.setContentView(this, R.layout.activity_semi_in); semiInLocation = binding.semiInLocation; semiInLocation.setOnFocusChangeListener(this); semiInVehicle = binding.semiInVehicle; semiInVehicle.setOnFocusChangeListener(this); - semiInVehicle.setOnTouchListener((v, event) -> { + semiInVehicle.setOnEditorActionListener((v, actionId, event) -> { + selectVehicleInfo(); + return true; + }); + semiInVehicle.setOnTouchListener((v, event) -> { if (event.getAction() == MotionEvent.ACTION_UP) { // 获取触摸的位置 int x = (int) event.getX(); @@ -78,6 +82,7 @@ public class SemiInActivity extends BaseActivity implements View.OnFocusChangeLi super.onSuccess(response); var body = response.body(); if (body.getCode()==200){ + Toast.makeText(SemiInActivity.this, "操作成功", Toast.LENGTH_SHORT).show(); finish(); } myToastUitls.show(body.getMsg()); diff --git a/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiOutActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiOutActivity.java index 8542414..51d4165 100644 --- a/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiOutActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiOutActivity.java @@ -11,17 +11,13 @@ import com.example.haiwei_mom.R; import com.example.haiwei_mom.base.BaseActivity; import com.example.haiwei_mom.base.MyRecultCall; import com.example.haiwei_mom.base.MyResult; -import com.example.haiwei_mom.data.SemiInVo; import com.example.haiwei_mom.data.SemiOutVo; -import com.example.haiwei_mom.databinding.ActivitySemiInBinding; import com.example.haiwei_mom.databinding.ActivitySemiOutBinding; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.Date; import okhttp3.RequestBody; @@ -35,6 +31,10 @@ public class SemiOutActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_semi_out); + binding.semiOutCode.setOnEditorActionListener((v, actionId, event) -> { + selectHppStorageInfo(binding.semiOutCode.getText().toString()); + return true; + }); binding.semiOutCode.setOnTouchListener((v, event) -> { if (event.getAction() == MotionEvent.ACTION_UP) { // 获取触摸的位置 diff --git a/app/src/main/res/drawable/text_bg2.xml b/app/src/main/res/drawable/text_bg2.xml new file mode 100644 index 0000000..003ac54 --- /dev/null +++ b/app/src/main/res/drawable/text_bg2.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index b18ff27..2b6b645 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -40,10 +40,14 @@ android:layout_height="match_parent" android:text="产品条码:" /> - @@ -92,17 +96,17 @@ android:paddingEnd="10dp" android:text="@{vm.defect}"/> - + + + + + + + + + + + @@ -125,28 +129,14 @@