wangh
/
mom-pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工装验证功能完善

Browse Source
master
wanghao 2 months ago
parent e43428fc7e
commit 1e928bf8ab
6 changed files with 203 additions and 32 deletions
Show Stats Download Patch File Download Diff File

1
app/src/main/java/com/example/haiwei_mom/ConfigActivity.java
Unescape Escape View File

@ -50,6 +50,7 @@ public class ConfigActivity extends BaseActivity {
return; return;
} }
SharedPreferencesUtils.putstring("machineIp", machineInfo.getMachineIp()); SharedPreferencesUtils.putstring("machineIp", machineInfo.getMachineIp());
SharedPreferencesUtils.putstring("machineNo", machineInfo.getMachineCode());
Toast.makeText(context, "保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "保存成功", Toast.LENGTH_SHORT).show();
finish(); finish();
} }

8
app/src/main/java/com/example/haiwei_mom/HomePageActivity.java
Unescape Escape View File

@ -112,11 +112,17 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
@Override @Override
public void onClick(int position) { public void onClick(int position) {
var menuName = menuList.get(position).getMenuName(); String menuName = menuList.get(position).getMenuName();
var cls = map.get(menuName); var cls = map.get(menuName);
if (cls == null) return; if (cls == null) return;
var intent = new Intent(this, cls); var intent = new Intent(this, cls);
intent.putExtra("title",menuName); intent.putExtra("title",menuName);
if (menuName.equals("机台投料")){
intent.putExtra("from","1");
}else if (menuName.equals("工装验证")){
intent.putExtra("from","4");
}
startActivity(intent); startActivity(intent);
} }
} }

70
app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java
Unescape Escape View File

@ -1,41 +1,62 @@
package com.example.haiwei_mom.ipc; 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.annotation.SuppressLint;
import android.os.Bundle; 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.R;
import com.example.haiwei_mom.base.BaseActivity; import com.example.haiwei_mom.base.BaseActivity;
import com.example.haiwei_mom.base.MyRecultCall; import com.example.haiwei_mom.base.MyRecultCall;
import com.example.haiwei_mom.base.MyResult; 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.databinding.ActivityFeedingMaterialsBinding;
import com.example.haiwei_mom.ipc.data.MachinePlan; import com.example.haiwei_mom.ipc.data.MachinePlan;
import com.example.haiwei_mom.uitls.SharedPreferencesUtils; 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.OkGo;
import com.lzy.okgo.model.Response; 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 { public class FeedingMaterialsActivity extends BaseActivity {
private ActivityFeedingMaterialsBinding binding; private ActivityFeedingMaterialsBinding binding;
private MachinePlan machinePlan; private MachinePlan machinePlan;
private String machineNo;
private String from;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_feeding_materials); binding = DataBindingUtil.setContentView(this, R.layout.activity_feeding_materials);
String title = getIntent().getStringExtra("title"); String title = getIntent().getStringExtra("title");
binding.setTitle(title); binding.setTitle(title);
from = getIntent().getStringExtra("from");
machineNo = SharedPreferencesUtils.getstring("machineNo", null);
binding.feedingCode.setText(machineNo);
initRequest(); 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() { private void initRequest() {
OkGo.<MyResult>post("http://"+SharedPreferencesUtils.getstring("machineIp",null) + "/api/plan/sel") Map map = new HashMap();
.params("machineNo", SharedPreferencesUtils.getstring("machineNo",null)) map.put("MachineNo", machineNo);
OkGo.<MyResult>post("http://" + SharedPreferencesUtils.getstring("machineIp", null) + "/api/plan/sel")
.upRequestBody(RequestBody.create(JSON, gson.toJson(map)))
.execute(new MyRecultCall(dialog, this) { .execute(new MyRecultCall(dialog, this) {
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
@Override @Override
@ -44,6 +65,9 @@ public class FeedingMaterialsActivity extends BaseActivity {
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { if (body.getCode() == 200) {
machinePlan = gson.fromJson(body.getDataJson(), MachinePlan.class);
binding.setMachineState(body.getMsg());
binding.setData(machinePlan);
return; return;
} }
myToastUitls.show(body.getMsg()); myToastUitls.show(body.getMsg());
@ -54,8 +78,20 @@ public class FeedingMaterialsActivity extends BaseActivity {
@Override @Override
public void getScannerData(String data) { public void getScannerData(String data) {
super.getScannerData(data); super.getScannerData(data);
OkGo.<MyResult>post("http://"+SharedPreferencesUtils.getstring("machineIp",null) + "/api/semi_product/scan") if (machinePlan==null){
.params("machineNo", SharedPreferencesUtils.getstring("machineNo",null)) return;
}
machinePlan.setFrom(from);
if (from.equals("4")){
machinePlan.setWorkCode(data);
}else {
machinePlan.setBarCode(data);
}
OkGo.<MyResult>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) { .execute(new MyRecultCall(dialog, this) {
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
@Override @Override
@ -63,11 +99,19 @@ public class FeedingMaterialsActivity extends BaseActivity {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { if (body.getCode() == 200) {
binding.feedingBarCode.setText(null);
return; // Toast.makeText(FeedingMaterialsActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
// return;
} }
myToastUitls.show(body.getMsg()); myToastUitls.show(body.getMsg());
} }
}); });
} }
public void feedingCodeSubmit(View view) {
String data = binding.feedingBarCode.getText().toString();
if (data.isEmpty()) return;
getScannerData(data);
}
} }

75
app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java
Unescape Escape View File

@ -1,21 +1,80 @@
package com.example.haiwei_mom.ipc.data; package com.example.haiwei_mom.ipc.data;
public class MachinePlan { public class MachinePlan {
private String planCode,materialName;
public String getPlanCode() { private String MachineNo;
return planCode; 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) { public void setFrom(String from) {
this.planCode = planCode; 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() { public String getMaterialName() {
return materialName; return MaterialName;
} }
public void setMaterialName(String materialName) { public void setMaterialName(String MaterialName) {
this.materialName = materialName; this.MaterialName = MaterialName;
} }
} }

1
app/src/main/res/layout/activity_config.xml
Unescape Escape View File

@ -100,6 +100,7 @@
style="@style/text_info" style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@{item.machineIp}" /> android:text="@{item.machineIp}" />
</LinearLayout> </LinearLayout>

80
app/src/main/res/layout/activity_feeding_materials.xml
Unescape Escape View File

@ -4,9 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<variable <variable
name="title" name="title"
type="String" /> type="String" />
<variable
name="machineState"
type="String" />
<variable <variable
name="data" name="data"
type="com.example.haiwei_mom.ipc.data.MachinePlan" /> type="com.example.haiwei_mom.ipc.data.MachinePlan" />
@ -33,9 +39,10 @@
style="@style/text_title" style="@style/text_title"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="选择机台:" /> android:text="机台编码:" />
<TextView <TextView
android:id="@+id/feeding_code"
style="@style/text_info" style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
@ -51,13 +58,13 @@
style="@style/text_title" style="@style/text_title"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="当前计划:" /> android:text="机台状态:" />
<TextView <TextView
style="@style/text_info" style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@{data.planCode}"/> android:text="@{machineState}" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -70,20 +77,73 @@
style="@style/text_title" style="@style/text_title"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="物料名称:" /> android:text="计划号:" />
<TextView <TextView
style="@style/text_info" style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@{data.materialName}"/> android:text="@{data.planCode}" />
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@color/white" android:layout_marginTop="8dp"
android:layout_margin="5dp" android:layout_marginEnd="4dp">
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
<TextView
style="@style/text_title"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="物料名称:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="left|center"
android:minHeight="45dp"
android:text="@{data.materialName}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="验证条码:" />
<EditText
android:id="@+id/feeding_barCode"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:lines="1"
android:maxLines="1"
android:inputType="text"
android:imeOptions="actionSearch" />
</LinearLayout>
<Button
style="@style/button_style"
android:layout_width="300dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginBottom="20dp"
android:layout_marginTop="100dp"
android:onClick="feedingCodeSubmit"
android:text="提交" />
</LinearLayout> </LinearLayout>
</layout> </layout>
Write Preview
Loading…
Cancel
Save