From 38eba84a89ef4c9e0ab1784a49901dbc4b786973 Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 21 May 2025 16:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/haiwei_mom/ClassItemActivity.java | 2 + .../example/haiwei_mom/ConfigActivity.java | 7 +- .../example/haiwei_mom/base/BaseActivity.java | 1 + .../haiwei_mom/data/BaseToolingInfo.java | 101 ++++++++++++++++++ .../example/haiwei_mom/data/MachineInfo.java | 9 ++ .../com/example/haiwei_mom/data/TyreInfo.java | 33 ++++++ .../ipc/FeedingMaterialsActivity.java | 30 ++++-- .../haiwei_mom/ipc/data/MachinePlan.java | 9 +- .../wms/product/BindVehicleActivity.java | 88 ++++++++++++--- .../main/res/layout/activity_bind_vehicle.xml | 63 ++++++++++- .../res/layout/activity_feeding_materials.xml | 32 +++++- .../main/res/layout/activity_product_in.xml | 2 +- .../main/res/layout/activity_product_out.xml | 95 ++++++++++++++-- 13 files changed, 431 insertions(+), 41 deletions(-) create mode 100644 app/src/main/java/com/example/haiwei_mom/data/BaseToolingInfo.java create mode 100644 app/src/main/java/com/example/haiwei_mom/data/TyreInfo.java diff --git a/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java b/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java index f9bf970..5c913c0 100644 --- a/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java @@ -82,6 +82,8 @@ public class ClassItemActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { + SharedPreferencesUtils.putstring("班组",classText); + SharedPreferencesUtils.putstring("班次",shiftText); finish(); return; } 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 abe3982..ba0578b 100644 --- a/app/src/main/java/com/example/haiwei_mom/ConfigActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/ConfigActivity.java @@ -24,6 +24,7 @@ public class ConfigActivity extends BaseActivity { private List machineInfoList; private List stringList; private ActivityConfigBinding binding; + private MachineInfo machineInfo; @Override protected void onCreate(Bundle savedInstanceState) { @@ -32,7 +33,6 @@ public class ConfigActivity extends BaseActivity { binding.configSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { - machineInfo = machineInfoList.get(position); binding.setItem(machineInfo); } @@ -44,13 +44,14 @@ public class ConfigActivity extends BaseActivity { }); initRequest(); } - private MachineInfo machineInfo; + public void configSubmit(View view) { - if (machineInfo==null|| machineInfo.getMachineIp().equals(":")){ + if (machineInfo == null || machineInfo.getMachineIp().equals(":")) { return; } SharedPreferencesUtils.putstring("machineIp", machineInfo.getMachineIp()); SharedPreferencesUtils.putstring("machineNo", machineInfo.getMachineCode()); + SharedPreferencesUtils.putstring("machineId", machineInfo.getMachineId()); Toast.makeText(context, "保存成功", Toast.LENGTH_SHORT).show(); finish(); } diff --git a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java index 32003cc..b75b1d7 100644 --- a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java @@ -41,6 +41,7 @@ import okhttp3.MediaType; public class BaseActivity extends AppCompatActivity implements MyScannerCall { public static final int CAMERA_PHOTO = 1; + // public static String url = "http://172.20.10.4:6080"; public static String url = "http://10.11.180.67:6080"; // public static String url = "http://1.13.177.47:6080"; public ProgressDialog dialog; diff --git a/app/src/main/java/com/example/haiwei_mom/data/BaseToolingInfo.java b/app/src/main/java/com/example/haiwei_mom/data/BaseToolingInfo.java new file mode 100644 index 0000000..5145c2f --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/BaseToolingInfo.java @@ -0,0 +1,101 @@ +package com.example.haiwei_mom.data; + +import java.util.List; + +/** + * 载具工装信息对象 base_tooling_info + * + * @author zangch + * @date 2025-01-08 + */ + +public class BaseToolingInfo { + + + private Long toolingId; + + /** + * 工装编号 + */ + private String toolingCode; + + /** + * 工装名称 + */ + private String toolingName; + + + /** + * 工装条码 + */ + private String toolingBarcode; + + /** + * 工装RFID条码 + */ + private String toolingRfidBarcode; + + /** + * 物料编号 + */ + private String materialCode; + + + private List tyreInfoList; + + public List getTyreInfoList() { + return tyreInfoList; + } + + public void setTyreInfoList(List tyreInfoList) { + this.tyreInfoList = tyreInfoList; + } + + public Long getToolingId() { + return toolingId; + } + + public void setToolingId(Long toolingId) { + this.toolingId = toolingId; + } + + public String getToolingCode() { + return toolingCode; + } + + public void setToolingCode(String toolingCode) { + this.toolingCode = toolingCode; + } + + public String getToolingName() { + return toolingName; + } + + public void setToolingName(String toolingName) { + this.toolingName = toolingName; + } + + public String getToolingBarcode() { + return toolingBarcode; + } + + public void setToolingBarcode(String toolingBarcode) { + this.toolingBarcode = toolingBarcode; + } + + public String getToolingRfidBarcode() { + return toolingRfidBarcode; + } + + public void setToolingRfidBarcode(String toolingRfidBarcode) { + this.toolingRfidBarcode = toolingRfidBarcode; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/data/MachineInfo.java b/app/src/main/java/com/example/haiwei_mom/data/MachineInfo.java index 7fc42a7..dfd3e18 100644 --- a/app/src/main/java/com/example/haiwei_mom/data/MachineInfo.java +++ b/app/src/main/java/com/example/haiwei_mom/data/MachineInfo.java @@ -5,8 +5,17 @@ public class MachineInfo { private String machineCode, machineName, machineIp; + private String machineId; + public String getMachineId() { + return machineId; + } + + public void setMachineId(String machineId) { + this.machineId = machineId; + } + public String getMachineCode() { return machineCode; } diff --git a/app/src/main/java/com/example/haiwei_mom/data/TyreInfo.java b/app/src/main/java/com/example/haiwei_mom/data/TyreInfo.java new file mode 100644 index 0000000..4d2a5ec --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/TyreInfo.java @@ -0,0 +1,33 @@ +package com.example.haiwei_mom.data; + + +public class TyreInfo { + + private String returnBarcode; + private Long materialId; + private String materialName; + + public String getReturnBarcode() { + return returnBarcode; + } + + public void setReturnBarcode(String returnBarcode) { + this.returnBarcode = returnBarcode; + } + + 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; + } +} 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 ff328d2..24b63c6 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 @@ -18,10 +18,12 @@ import com.example.haiwei_mom.ipc.data.MachinePlan; import com.example.haiwei_mom.uitls.SharedPreferencesUtils; import com.google.android.material.snackbar.Snackbar; +import com.google.gson.reflect.TypeToken; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; import java.util.HashMap; +import java.util.List; import java.util.Map; import okhttp3.RequestBody; @@ -42,16 +44,11 @@ public class FeedingMaterialsActivity extends BaseActivity { 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() { Map map = new HashMap(); map.put("MachineNo", machineNo); @@ -68,6 +65,25 @@ public class FeedingMaterialsActivity extends BaseActivity { machinePlan = gson.fromJson(body.getDataJson(), MachinePlan.class); binding.setMachineState(body.getMsg()); binding.setData(machinePlan); + selectMachineStationList(); + return; + } + myToastUitls.show(body.getMsg()); + } + }); + } + private void selectMachineStationList(){ + OkGo.post(url + "/wms/pda/selectMachineStationList") + .params("machineId", SharedPreferencesUtils.getstring("machineId","")) + + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + List list=gson.fromJson(body.getDataJson(),new TypeToken>(){}.getType()); + binding.setList(list); return; } myToastUitls.show(body.getMsg()); @@ -87,7 +103,7 @@ public class FeedingMaterialsActivity extends BaseActivity { // }else { machinePlan.setBarCode(data); // } - + machinePlan.setStationCode(binding.feedingSelectStation.getSelectedItem().toString()); OkGo.post("http://" + SharedPreferencesUtils.getstring("machineIp", null) + "/api/semi_product/scan") // .params("machineNo", machineNo) 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 21e2786..dacd2ca 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 @@ -8,11 +8,18 @@ public class MachinePlan { private String MaterialId; private String MaterialName; - + private String stationCode; private String from; private String barCode; private String workCode; + public String getStationCode() { + return stationCode; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } public String getFrom() { return from; diff --git a/app/src/main/java/com/example/haiwei_mom/wms/product/BindVehicleActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/product/BindVehicleActivity.java index 91ea100..8a6270a 100644 --- a/app/src/main/java/com/example/haiwei_mom/wms/product/BindVehicleActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/wms/product/BindVehicleActivity.java @@ -1,20 +1,21 @@ package com.example.haiwei_mom.wms.product; -import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ObservableInt; - import android.annotation.SuppressLint; import android.os.Bundle; import android.util.Log; import android.view.View; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableInt; + import com.example.haiwei_mom.R; import com.example.haiwei_mom.adapter.BindVehicleAdapter; import com.example.haiwei_mom.adapter.ItemClickCall; 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.BaseToolingInfo; +import com.example.haiwei_mom.data.TyreInfo; import com.example.haiwei_mom.databinding.ActivityBindVehicleBinding; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; @@ -23,11 +24,13 @@ import java.util.ArrayList; import java.util.List; public class BindVehicleActivity extends BaseActivity implements ItemClickCall { + boolean sanState = true; private ActivityBindVehicleBinding binding; private ArrayList list; private BindVehicleAdapter adapter; private ObservableInt listSize; - + private List tyreInfoList; + private BaseToolingInfo baseToolingInfo; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -38,25 +41,82 @@ public class BindVehicleActivity extends BaseActivity implements ItemClickCall { adapter = new BindVehicleAdapter(this, this); adapter.setList(list); binding.setAdapter(adapter); + binding.bindVehicleCode.setOnEditorActionListener((v, actionId, event) -> { + selectVehicle(v.getText().toString()); + return true; + }); + + binding.bindProductCode.setOnEditorActionListener((v, actionId, event) -> { + selectTyre(v.getText().toString()); + return true; + }); + } + // 查询工装 + private void selectVehicle(String code) { + OkGo.post(url + "/wms/pda/product/selectVehicle") + .params("code", code) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + binding.setCode2(null); + if (body.getCode() == 200) { + + baseToolingInfo = gson.fromJson(body.getDataJson(), BaseToolingInfo.class); + binding.setCode2(baseToolingInfo.getToolingCode()); + sanState = false; + tyreInfoList=new ArrayList<>(); + baseToolingInfo.setTyreInfoList(tyreInfoList); + + } + myToastUitls.show(body.getMsg()); + } + }); + + } + + // 查询轮胎 + private void selectTyre(String code) { + OkGo.post(url + "/wms/pda/product/selectTyreCode") + .params("code", code) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + TyreInfo tyreInfo= gson.fromJson(body.getDataJson(), TyreInfo.class); + String data = tyreInfo.getReturnBarcode(); + if (list.contains(data)) { + return; + } + Log.e("TAG", "getScannerData:" + listSize.get()); + list.add(data); + adapter.notifyDataSetChanged(); + listSize.set(list.size()); + } + myToastUitls.show(body.getMsg()); + } + }); + + } + + + @SuppressLint("NotifyDataSetChanged") @Override public void getScannerData(String data) { super.getScannerData(data); - var text = binding.bindVehicleCode.getText().toString(); - if (text.isEmpty()) { + if (sanState) { binding.bindVehicleCode.setText(data); + selectVehicle(data); return; } - if (list.contains(data)) { - return; - } - Log.e("TAG", "getScannerData:" + listSize.get()); - list.add(data); - adapter.notifyDataSetChanged(); - listSize.set(list.size()); + } @SuppressLint("NotifyDataSetChanged") diff --git a/app/src/main/res/layout/activity_bind_vehicle.xml b/app/src/main/res/layout/activity_bind_vehicle.xml index 328e441..21484f6 100644 --- a/app/src/main/res/layout/activity_bind_vehicle.xml +++ b/app/src/main/res/layout/activity_bind_vehicle.xml @@ -8,12 +8,18 @@ + + + + + android:layout_height="match_parent" + android:imeOptions="actionSearch" + android:inputType="text" + android:lines="1" /> + + + + + + + + @@ -52,10 +82,10 @@ android:layout_height="match_parent" android:layout_margin="5dp" android:layout_weight="1" - android:padding="2dp" + android:adapter="@{adapter}" android:background="@drawable/text_edit" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - android:adapter="@{adapter}"/> + android:padding="2dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + + + + + + +