From 1e928bf8abd68a782407aa8cb6bf509f0c4327e9 Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 6 May 2025 09:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=A3=85=E9=AA=8C=E8=AF=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/haiwei_mom/ConfigActivity.java | 1 + .../example/haiwei_mom/HomePageActivity.java | 8 +- .../ipc/FeedingMaterialsActivity.java | 70 +++++++++++++--- .../haiwei_mom/ipc/data/MachinePlan.java | 75 +++++++++++++++-- app/src/main/res/layout/activity_config.xml | 1 + .../res/layout/activity_feeding_materials.xml | 80 ++++++++++++++++--- 6 files changed, 203 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/example/haiwei_mom/ConfigActivity.java b/app/src/main/java/com/example/haiwei_mom/ConfigActivity.java index 513dda1..abe3982 100644 --- a/app/src/main/java/com/example/haiwei_mom/ConfigActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/ConfigActivity.java @@ -50,6 +50,7 @@ public class ConfigActivity extends BaseActivity { return; } SharedPreferencesUtils.putstring("machineIp", machineInfo.getMachineIp()); + SharedPreferencesUtils.putstring("machineNo", machineInfo.getMachineCode()); Toast.makeText(context, "保存成功", Toast.LENGTH_SHORT).show(); finish(); } 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 d0aab7f..549cc45 100644 --- a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java @@ -112,11 +112,17 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { @Override public void onClick(int position) { - var menuName = menuList.get(position).getMenuName(); + String menuName = menuList.get(position).getMenuName(); var cls = map.get(menuName); if (cls == null) return; var intent = new Intent(this, cls); intent.putExtra("title",menuName); + if (menuName.equals("机台投料")){ + intent.putExtra("from","1"); + }else if (menuName.equals("工装验证")){ + intent.putExtra("from","4"); + } + startActivity(intent); } } \ No newline at end of file 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 9d30396..5bf6f59 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 @@ -1,41 +1,62 @@ package com.example.haiwei_mom.ipc; -import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; - import android.annotation.SuppressLint; import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.view.inputmethod.EditorInfo; +import android.widget.Toast; + +import androidx.databinding.DataBindingUtil; 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.WmsInventoryVo; import com.example.haiwei_mom.databinding.ActivityFeedingMaterialsBinding; import com.example.haiwei_mom.ipc.data.MachinePlan; import com.example.haiwei_mom.uitls.SharedPreferencesUtils; -import com.google.gson.reflect.TypeToken; + +import com.google.android.material.snackbar.Snackbar; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; -import java.util.List; +import java.util.HashMap; +import java.util.Map; + +import okhttp3.RequestBody; public class FeedingMaterialsActivity extends BaseActivity { private ActivityFeedingMaterialsBinding binding; private MachinePlan machinePlan; + private String machineNo; + private String from; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_feeding_materials); String title = getIntent().getStringExtra("title"); binding.setTitle(title); + from = getIntent().getStringExtra("from"); + machineNo = SharedPreferencesUtils.getstring("machineNo", null); + binding.feedingCode.setText(machineNo); initRequest(); + binding.feedingBarCode.setOnEditorActionListener((v, actionId, event) -> { + // Log.e("TAG", "搜索1:" ); + // if (actionId == EditorInfo.IME_ACTION_SEARCH){ + // Log.e("TAG", "搜索2:" ); + // + // } + feedingCodeSubmit(null); + return true; + }); } private void initRequest() { - OkGo.post("http://"+SharedPreferencesUtils.getstring("machineIp",null) + "/api/plan/sel") - .params("machineNo", SharedPreferencesUtils.getstring("machineNo",null)) + Map map = new HashMap(); + map.put("MachineNo", machineNo); + OkGo.post("http://" + SharedPreferencesUtils.getstring("machineIp", null) + "/api/plan/sel") + .upRequestBody(RequestBody.create(JSON, gson.toJson(map))) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override @@ -44,6 +65,9 @@ public class FeedingMaterialsActivity extends BaseActivity { var body = response.body(); if (body.getCode() == 200) { + machinePlan = gson.fromJson(body.getDataJson(), MachinePlan.class); + binding.setMachineState(body.getMsg()); + binding.setData(machinePlan); return; } myToastUitls.show(body.getMsg()); @@ -54,8 +78,20 @@ public class FeedingMaterialsActivity extends BaseActivity { @Override public void getScannerData(String data) { super.getScannerData(data); - OkGo.post("http://"+SharedPreferencesUtils.getstring("machineIp",null) + "/api/semi_product/scan") - .params("machineNo", SharedPreferencesUtils.getstring("machineNo",null)) + if (machinePlan==null){ + return; + } + machinePlan.setFrom(from); + if (from.equals("4")){ + machinePlan.setWorkCode(data); + }else { + machinePlan.setBarCode(data); + } + + OkGo.post("http://" + SharedPreferencesUtils.getstring("machineIp", null) + + "/api/semi_product/scan") + // .params("machineNo", machineNo) + .upRequestBody(RequestBody.create(JSON, gson.toJson(machinePlan))) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override @@ -63,11 +99,19 @@ public class FeedingMaterialsActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - - return; + binding.feedingBarCode.setText(null); + // Toast.makeText(FeedingMaterialsActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); + // return; } myToastUitls.show(body.getMsg()); } }); } + + public void feedingCodeSubmit(View view) { + + String data = binding.feedingBarCode.getText().toString(); + if (data.isEmpty()) return; + getScannerData(data); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java b/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java index 545f92f..21e2786 100644 --- a/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java +++ b/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java @@ -1,21 +1,80 @@ package com.example.haiwei_mom.ipc.data; public class MachinePlan { - private String planCode,materialName; - public String getPlanCode() { - return planCode; + private String MachineNo; + private String PlanId; + private String PlanCode; + private String MaterialId; + private String MaterialName; + + + private String from; + private String barCode; + private String workCode; + + + public String getFrom() { + return from; } - public void setPlanCode(String planCode) { - this.planCode = planCode; + public void setFrom(String from) { + this.from = from; + } + + public String getBarCode() { + return barCode; + } + + public void setBarCode(String barCode) { + this.barCode = barCode; + } + + public String getWorkCode() { + return workCode; + } + + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getMachineNo() { + return MachineNo; + } + + public void setMachineNo(String MachineNo) { + this.MachineNo = MachineNo; + } + + public String getPlanId() { + return PlanId; + } + + public void setPlanId(String PlanId) { + this.PlanId = PlanId; + } + + public String getPlanCode() { + return PlanCode; + } + + public void setPlanCode(String PlanCode) { + this.PlanCode = PlanCode; + } + + public String getMaterialId() { + return MaterialId; + } + + public void setMaterialId(String MaterialId) { + this.MaterialId = MaterialId; } public String getMaterialName() { - return materialName; + return MaterialName; } - public void setMaterialName(String materialName) { - this.materialName = materialName; + public void setMaterialName(String MaterialName) { + this.MaterialName = MaterialName; } } diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml index dfe325c..3a3e810 100644 --- a/app/src/main/res/layout/activity_config.xml +++ b/app/src/main/res/layout/activity_config.xml @@ -100,6 +100,7 @@ style="@style/text_info" android:layout_width="match_parent" android:layout_height="match_parent" + android:text="@{item.machineIp}" /> diff --git a/app/src/main/res/layout/activity_feeding_materials.xml b/app/src/main/res/layout/activity_feeding_materials.xml index 2e1d971..e58db38 100644 --- a/app/src/main/res/layout/activity_feeding_materials.xml +++ b/app/src/main/res/layout/activity_feeding_materials.xml @@ -4,9 +4,15 @@ xmlns:tools="http://schemas.android.com/tools"> + + + + @@ -33,9 +39,10 @@ style="@style/text_title" android:layout_width="100dp" android:layout_height="match_parent" - android:text="选择机台:" /> + android:text="机台编码:" /> @@ -51,13 +58,13 @@ style="@style/text_title" android:layout_width="100dp" android:layout_height="match_parent" - android:text="当前计划:" /> + android:text="机台状态:" /> + android:text="@{machineState}" /> + android:text="计划号:" /> + android:text="@{data.planCode}" /> - + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginEnd="4dp"> + + + + + + + + + + + + + + + + +