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

完善 质检

Browse Source
master
wanghao 2 months ago
parent 1e928bf8ab
commit c0350056a6
18 changed files with 328 additions and 226 deletions
Show Stats Download Patch File Download Diff File

3
.idea/dictionaries/wanghao.xml
Unescape Escape View File

@ -0,0 +1,3 @@
<component name="ProjectDictionaryState">
<dictionary name="wanghao" />
</component>

6
.idea/inspectionProfiles/Project_Default.xml
Unescape Escape View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="RawUseOfParameterizedType" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

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

@ -69,7 +69,8 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
map.put("制品复检", CheckActivity.class); map.put("制品复检", CheckActivity.class);
map.put("机台投料", FeedingMaterialsActivity.class); map.put("机台投料", FeedingMaterialsActivity.class);
map.put("工装验证", FeedingMaterialsActivity.class); map.put("工装验证", FeedingMaterialsActivity.class);
// map.put("产出工装绑定", CheckActivity.class); map.put("载具绑定", FeedingMaterialsActivity.class);
map.put("系统配置", ConfigActivity.class); map.put("系统配置", ConfigActivity.class);
map.put("班组管理", ClassItemActivity.class); map.put("班组管理", ClassItemActivity.class);
} }
@ -120,6 +121,8 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
if (menuName.equals("机台投料")){ if (menuName.equals("机台投料")){
intent.putExtra("from","1"); intent.putExtra("from","1");
}else if (menuName.equals("工装验证")){ }else if (menuName.equals("工装验证")){
intent.putExtra("from","2");
}else if (menuName.equals("载具绑定")){
intent.putExtra("from","4"); intent.putExtra("from","4");
} }

2
app/src/main/java/com/example/haiwei_mom/base/MyApplication.java
Unescape Escape View File

@ -66,7 +66,7 @@ public class MyApplication extends Application {
OkGo.getInstance().init(this).setOkHttpClient(builder.build()) // 建议设置OkHttpClient，不设置将使用默认的 OkGo.getInstance().init(this).setOkHttpClient(builder.build()) // 建议设置OkHttpClient，不设置将使用默认的
.setCacheMode(CacheMode.NO_CACHE) // 全局统一缓存模式，默认不使用缓存，可以不传 .setCacheMode(CacheMode.NO_CACHE) // 全局统一缓存模式，默认不使用缓存，可以不传
.setCacheTime(CacheEntity.CACHE_NEVER_EXPIRE) // 全局统一缓存时间，默认永不过期，可以不传 .setCacheTime(CacheEntity.CACHE_NEVER_EXPIRE) // 全局统一缓存时间，默认永不过期，可以不传
.setRetryCount(3) .setRetryCount(1)
.addCommonHeaders(headers); .addCommonHeaders(headers);

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

@ -82,11 +82,11 @@ public class FeedingMaterialsActivity extends BaseActivity {
return; return;
} }
machinePlan.setFrom(from); machinePlan.setFrom(from);
if (from.equals("4")){ // if (from.equals("4")){
machinePlan.setWorkCode(data); // machinePlan.setWorkCode(data);
}else { // }else {
machinePlan.setBarCode(data); machinePlan.setBarCode(data);
} // }
OkGo.<MyResult>post("http://" + SharedPreferencesUtils.getstring("machineIp", null) + OkGo.<MyResult>post("http://" + SharedPreferencesUtils.getstring("machineIp", null) +
"/api/semi_product/scan") "/api/semi_product/scan")
@ -99,6 +99,8 @@ 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) {
machinePlan = gson.fromJson(body.getDataJson(), MachinePlan.class);
binding.setData(machinePlan);
binding.feedingBarCode.setText(null); binding.feedingBarCode.setText(null);
// Toast.makeText(FeedingMaterialsActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); // Toast.makeText(FeedingMaterialsActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
// return; // return;

140
app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java
Unescape Escape View File

@ -8,25 +8,23 @@ import android.widget.Toast;
import androidx.databinding.DataBindingUtil; import androidx.databinding.DataBindingUtil;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.listener.OnOptionsSelectListener; import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.OptionsPickerView;
import com.example.haiwei_mom.R; import com.example.haiwei_mom.R;
import com.example.haiwei_mom.adapter.CheckAdapter; import com.example.haiwei_mom.adapter.CheckAdapter;
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.databinding.ActivityCheckBinding; import com.example.haiwei_mom.databinding.ActivityCheckBinding;
import com.example.haiwei_mom.qm.data.CheckViewModel; import com.example.haiwei_mom.qm.data.CheckViewModel;
import com.example.haiwei_mom.qm.data.DefectBeen; 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.example.haiwei_mom.uitls.SharedPreferencesUtils;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
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.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -49,55 +47,31 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(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); ActivityCheckBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_check);
checkViewModel = new CheckViewModel(); checkViewModel = new CheckViewModel();
binding.setVm(checkViewModel); binding.setVm(checkViewModel);
checkAdapter = new CheckAdapter(this, this); checkAdapter = new CheckAdapter(this, this);
submitList = new ArrayList<>(); submitList = new ArrayList<>();
checkAdapter.setList(submitList); checkAdapter.setList(submitList);
binding.recyclerView.setAdapter(checkAdapter); binding.recyclerView.setAdapter(checkAdapter);
binding.checkGoodsCode.setOnEditorActionListener((v, actionId, event) -> {
} selectGoodsInfo(v.getText().toString());
return true;
private void initStationSum() {
OkGo.<MyResult>post(url + "/api/pdaQueryQuantityNumber").tag(this).params("stationCode", stationCode).execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> 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());
}
}
}
}); });
}
}
@Override @Override
public void getScannerData(String code) { public void getScannerData(String code) {
super.getScannerData(code); super.getScannerData(code);
checkViewModel.setCode(code); selectGoodsInfo(code);
OkGo.<MyResult>post(url + "/dev-api/api/pdaApi/getMateriallnfo" + code).tag(this)
// .params("code", code) }
// 查询物料
public void selectGoodsInfo(String code) {
OkGo.<MyResult>get(url + "/api/pdaApi/getMaterialInfo").tag(this)
.params("code", code)
// .params("station", stationCode) // .params("station", stationCode)
.execute(new MyRecultCall(dialog, this) { .execute(new MyRecultCall(dialog, this) {
@Override @Override
@ -105,6 +79,9 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
super.onSuccess(response); super.onSuccess(response);
var result = response.body(); var result = response.body();
if (result.getCode() == 200) { if (result.getCode() == 200) {
QcTaskInfo qcTaskInfo=gson.fromJson(result.getDataJson(),QcTaskInfo.class);
checkViewModel.setName(qcTaskInfo.getMaterialName());
initOptionpb( qcTaskInfo.getOperation());
/* checkViewModel.setName(result.getMsg()); /* checkViewModel.setName(result.getMsg());
topDefects = gson.fromJson(gson.toJson(result.getData()), new TypeToken<List<DefectBeen>>() { topDefects = gson.fromJson(gson.toJson(result.getData()), new TypeToken<List<DefectBeen>>() {
}.getType()); }.getType());
@ -115,6 +92,7 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
checkViewModel.setButtonVisbleState(true);*/ checkViewModel.setButtonVisbleState(true);*/
// tipDialog.setList(topDefects); // tipDialog.setList(topDefects);
// tipDialog.show(); // tipDialog.show();
return; return;
} }
@ -122,26 +100,24 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
} }
}); });
} }
// 弹出选择框 // 弹出选择框
public void checkSelect(View view) { public void checkSelect(View view) {
if (options1==null ||list.isEmpty()) return;
opv.show(); opv.show();
} }
// 弹出返修
// public void selectRepair(View view) {
// tipDialog.show();
// }
public void checkSubmint1(View view) {
getScannerData("B24031483025025351528");
} // 提交
public void checkSubmint(View view) { public void checkSubmint(View view) {
if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return; 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.setMeasure(submitList.isEmpty() ? "3" : "1");
checkViewModel.setUserName(SharedPreferencesUtils.getstring("loginName", "pda01")); checkViewModel.setUserName(SharedPreferencesUtils.getstring("loginName", "pda01"));
checkViewModel.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); checkViewModel.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null));
@ -158,12 +134,12 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
checkViewModel.setButtonVisbleState(false); checkViewModel.setButtonVisbleState(false);
submitList.clear(); submitList.clear();
checkAdapter.notifyDataSetChanged(); checkAdapter.notifyDataSetChanged();
initStationSum(); // initStationSum();
} else { } else {
Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); 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) { private void initOptionpb(String stationCode) {
opv = new OptionsPickerBuilder(this, this).build(); opv = new OptionsPickerBuilder(this, this).build();
OkGo.<MyResult>get(url + "/base/qualityInspectionItem/getQualityDefects/" + stationCode).tag(this).execute(new MyRecultCall(dialog, this) { OkGo.<MyResult>get(url + "/api/pdaApi/getDefectDetail")
// .params("defectType", "BZP_DEFECT")
.params("defectType", stationCode).execute(new MyRecultCall(dialog, this) {
@Override @Override
public void onSuccess(Response<MyResult> response) { public void onSuccess(Response<MyResult> response) {
super.onSuccess(response); super.onSuccess(response);
@ -191,36 +169,38 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show();
return; return;
} }
options1 = new ArrayList<>(); options1 = new ArrayList<>(list.size());
options2 = new ArrayList<>(); // options2 = new ArrayList<>();
options3 = new ArrayList<>(); // options3 = new ArrayList<>();
list.forEach(defect -> { list.forEach(defect -> {
String materialCategories = defect.getMaterialCategories(); options1.add(defect.getDefectDesc());
String materialSubclass = defect.getMaterialSubclass(); // String materialCategories = defect.getMaterialCategories();
String qualityDefectName = defect.getQualityDefectName(); // String materialSubclass = defect.getMaterialSubclass();
// String qualityDefectName = defect.getQualityDefectName();
if (!options1.contains(materialCategories)) { //
options1.add(materialCategories); // if (!options1.contains(materialCategories)) {
} // options1.add(materialCategories);
int index1 = options1.indexOf(materialCategories); // }
if (options2.size() <= index1) { // int index1 = options1.indexOf(materialCategories);
options2.add(new ArrayList<>()); // if (options2.size() <= index1) {
} // options2.add(new ArrayList<>());
if (!options2.get(index1).contains(materialSubclass)) { // }
options2.get(index1).add(materialSubclass); // if (!options2.get(index1).contains(materialSubclass)) {
} // options2.get(index1).add(materialSubclass);
int index2 = options2.get(index1).indexOf(materialSubclass); // }
if (options3.size() <= index1) { // int index2 = options2.get(index1).indexOf(materialSubclass);
options3.add(new ArrayList<>()); // if (options3.size() <= index1) {
} // options3.add(new ArrayList<>());
if (options3.get(index1).size() <= index2) { // }
options3.get(index1).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); // 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 { } else {
Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
} }
@ -232,10 +212,10 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
// 三联添加 // 三联添加
@Override @Override
public void onOptionsSelect(int options1, int options2, int options3, View v) { 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); checkViewModel.setDefect(defectName);
DefectBeen defectBeen = new DefectBeen(); DefectBeen defectBeen = new DefectBeen();
defectBeen.setQualityDefectName(defectName); defectBeen.setDefectDesc(defectName);
DefectBeen defectBeen1 = list.get(list.indexOf(defectBeen)); DefectBeen defectBeen1 = list.get(list.indexOf(defectBeen));
if (submitList.contains(defectBeen1)) { if (submitList.contains(defectBeen1)) {
Toast.makeText(this, "已经添加了", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "已经添加了", Toast.LENGTH_SHORT).show();

42
app/src/main/java/com/example/haiwei_mom/qm/data/DefectBeen.java
Unescape Escape View File

@ -10,7 +10,8 @@ import java.util.Objects;
*/ */
public class DefectBeen extends BaseObservable { public class DefectBeen extends BaseObservable {
private String defectCode;
private String defectDesc;
private int index; private int index;
private int objId; private int objId;
@ -21,12 +22,29 @@ public class DefectBeen extends BaseObservable {
private String stationCode; private String stationCode;
private String qualityDefectCode; private String qualityDefectCode;
private String qualityDefectName; private String qualityDefectName;
private String processResult;//返修结果 private String processResult;// 返修结果
private String productLineName;//pda 工位名称 private String productLineName;// pda 工位名称
private String productLineCode; private String productLineCode;
private String inspectorTime; 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() { public String getInspectorTime() {
return inspectorTime; return inspectorTime;
} }
@ -51,10 +69,6 @@ public class DefectBeen extends BaseObservable {
this.productLineName = productLineName; this.productLineName = productLineName;
} }
public void setIndex(int index) {
this.index = index;
}
public String getStationCode() { public String getStationCode() {
return stationCode; return stationCode;
} }
@ -78,12 +92,12 @@ public class DefectBeen extends BaseObservable {
DefectBeen that = (DefectBeen) o; DefectBeen that = (DefectBeen) o;
return Objects.equals(qualityDefectName, that.qualityDefectName); return Objects.equals(defectDesc, that.defectDesc);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return qualityDefectName != null ? qualityDefectName.hashCode() : 0; return defectDesc != null ? defectDesc.hashCode() : 0;
} }
public int getObjId() { public int getObjId() {
@ -98,6 +112,10 @@ public class DefectBeen extends BaseObservable {
return index; return index;
} }
public void setIndex(int index) {
this.index = index;
}
public String getMaterialCategories() { public String getMaterialCategories() {
return materialCategories; return materialCategories;
} }
@ -115,7 +133,8 @@ public class DefectBeen extends BaseObservable {
} }
public String getQualityDefectCode() { public String getQualityDefectCode() {
return qualityDefectCode; return defectCode;
// return qualityDefectCode;
} }
public void setQualityDefectCode(String qualityDefectCode) { public void setQualityDefectCode(String qualityDefectCode) {
@ -123,7 +142,8 @@ public class DefectBeen extends BaseObservable {
} }
public String getQualityDefectName() { public String getQualityDefectName() {
return qualityDefectName; // return qualityDefectName;
return getDefectDesc();
} }
public void setQualityDefectName(String qualityDefectName) { public void setQualityDefectName(String qualityDefectName) {

41
app/src/main/java/com/example/haiwei_mom/qm/data/QcTaskInfo.java
Unescape Escape View File

@ -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;
}
}

9
app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java
Unescape Escape View File

@ -9,6 +9,7 @@ import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast;
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;
@ -30,14 +31,17 @@ public class SemiInActivity extends BaseActivity implements View.OnFocusChangeLi
@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_semi_in); binding = DataBindingUtil.setContentView(this, R.layout.activity_semi_in);
semiInLocation = binding.semiInLocation; semiInLocation = binding.semiInLocation;
semiInLocation.setOnFocusChangeListener(this); semiInLocation.setOnFocusChangeListener(this);
semiInVehicle = binding.semiInVehicle; semiInVehicle = binding.semiInVehicle;
semiInVehicle.setOnFocusChangeListener(this); 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) { if (event.getAction() == MotionEvent.ACTION_UP) {
// 获取触摸的位置 // 获取触摸的位置
int x = (int) event.getX(); int x = (int) event.getX();
@ -78,6 +82,7 @@ public class SemiInActivity extends BaseActivity implements View.OnFocusChangeLi
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode()==200){ if (body.getCode()==200){
Toast.makeText(SemiInActivity.this, "操作成功", Toast.LENGTH_SHORT).show();
finish(); finish();
} }
myToastUitls.show(body.getMsg()); myToastUitls.show(body.getMsg());

8
app/src/main/java/com/example/haiwei_mom/wms/semi/SemiOutActivity.java
Unescape Escape View File

@ -11,17 +11,13 @@ 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.SemiInVo;
import com.example.haiwei_mom.data.SemiOutVo; import com.example.haiwei_mom.data.SemiOutVo;
import com.example.haiwei_mom.databinding.ActivitySemiInBinding;
import com.example.haiwei_mom.databinding.ActivitySemiOutBinding; import com.example.haiwei_mom.databinding.ActivitySemiOutBinding;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.model.Response; import com.lzy.okgo.model.Response;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Date;
import okhttp3.RequestBody; import okhttp3.RequestBody;
@ -35,6 +31,10 @@ public class SemiOutActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_semi_out); 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) -> { binding.semiOutCode.setOnTouchListener((v, event) -> {
if (event.getAction() == MotionEvent.ACTION_UP) { if (event.getAction() == MotionEvent.ACTION_UP) {
// 获取触摸的位置 // 获取触摸的位置

5
app/src/main/res/drawable/text_bg2.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F3F3F3"/>
<corners android:radius="6dp"/>
</shape>

50
app/src/main/res/layout/activity_check.xml
Unescape Escape View File

@ -40,10 +40,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="产品条码:" /> android:text="产品条码:" />
<TextView <EditText
android:id="@+id/check_goods_code"
style="@style/text_san" style="@style/text_san"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:imeOptions="actionSearch"
android:inputType="text"
android:lines="1"
android:text="@={vm.code}" /> android:text="@={vm.code}" />
</LinearLayout> </LinearLayout>
@ -92,17 +96,17 @@
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:text="@{vm.defect}"/> android:text="@{vm.defect}"/>
<TextView <!-- <TextView-->
android:layout_width="50dp" <!-- android:layout_width="50dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:background="@drawable/text_bg_g" <!-- android:background="@drawable/text_bg_g"-->
android:gravity="center" <!-- android:gravity="center"-->
android:onClick="selectRepair" <!-- android:onClick="selectRepair"-->
android:text="显示\n返修" <!-- android:text="显示\n返修"-->
android:textColor="@color/white" <!-- android:textColor="@color/white"-->
android:textSize="15sp" <!-- android:textSize="15sp"-->
android:textStyle="bold" <!-- android:textStyle="bold"-->
android:visibility="@{vm.buttonVisbleState? View.VISIBLE : View.GONE}" /> <!-- android:visibility="@{vm.buttonVisbleState? View.VISIBLE : View.GONE}" />-->
</LinearLayout> </LinearLayout>
@ -125,28 +129,14 @@
<Button <Button
style="@style/button_style" style="@style/button_style"
android:layout_width="match_parent" android:layout_width="200dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginLeft="20dp" android:layout_gravity="center"
android:layout_marginTop="5dp" android:layout_margin="10dp"
android:layout_marginRight="20dp" android:onClick="checkSubmint"
android:onClick="checkSubmint"
android:text="提交" /> android:text="提交" />
<Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="5dp"
android:layout_marginRight="20dp"
android:onClick="checkSubmint1"
android:text="test"
android:visibility="gone" />
<!-- 查询数据 -->
</LinearLayout> </LinearLayout>

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

@ -130,7 +130,6 @@
style="@style/spinner_style" style="@style/spinner_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:entries="@{list2}" /> android:entries="@{list2}" />
</LinearLayout> </LinearLayout>

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

@ -4,12 +4,17 @@
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 <variable
name="data" name="data"
type="java.util.List" /> type="java.util.List" />
<variable
name="dataGx"
type="java.util.List" />
<variable <variable
name="item" name="item"
@ -24,93 +29,110 @@
<include <include
layout="@layout/toolbar" layout="@layout/toolbar"
app:title='@{title??"机台配置"}' /> app:title='@{title??"系统配置"}' />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_margin="2dp"
android:layout_marginEnd="4dp"> android:background="@drawable/san_text_bg"
android:orientation="vertical"
android:padding="5dp">
<TextView <TextView
style="@style/text_title"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="选择机台:" />
<Spinner
android:id="@+id/config_spinner"
style="@style/spinner_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:entries="@{data}" /> android:text="机台配置：" />
</LinearLayout>
<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="机台编码:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="50dp"
android:text="@{item.machineCode}" /> android:layout_marginTop="8dp"
</LinearLayout> android:layout_marginEnd="4dp">
<LinearLayout <TextView
android:layout_width="match_parent" style="@style/text_title"
android:layout_height="45dp" android:layout_width="100dp"
android:layout_marginTop="8dp" android:layout_height="match_parent"
android:layout_marginEnd="4dp"> android:text="选择机台:" />
<TextView <Spinner
style="@style/text_title" android:id="@+id/config_spinner"
android:layout_width="100dp" style="@style/spinner_style"
android:layout_height="match_parent" android:layout_width="match_parent"
android:text="机台名称:" /> android:layout_height="match_parent"
android:entries="@{data}" />
</LinearLayout>
<TextView <LinearLayout
style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="45dp"
android:text="@{item.machineName}" /> android:layout_marginTop="8dp"
</LinearLayout> android:layout_marginEnd="4dp">
<LinearLayout <TextView
android:layout_width="match_parent" style="@style/text_title"
android:layout_height="45dp" android:layout_width="100dp"
android:layout_marginTop="8dp" android:layout_height="match_parent"
android:layout_marginEnd="4dp"> android:text="机台编码:" />
<TextView <TextView
style="@style/text_title" style="@style/text_info2"
android:layout_width="100dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="服务地址:" /> android:text="@{item.machineCode}" />
</LinearLayout>
<TextView <LinearLayout
style="@style/text_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="45dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp">
android:text="@{item.machineIp}" /> <TextView
style="@style/text_title"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="机台名称:" />
<TextView
style="@style/text_info2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@{item.machineName}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="服务地址:" />
<TextView
style="@style/text_info2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@{item.machineIp}" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<Button <Button
android:onClick="configSubmit" style="@style/button_style"
android:layout_marginTop="200dp"
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
style="@style/button_style" android:layout_marginTop="200dp"
android:onClick="configSubmit"
android:text="保存" /> android:text="保存" />
</LinearLayout> </LinearLayout>
</layout> </layout>

70
app/src/main/res/layout/activity_semi_in.xml
Unescape Escape View File

@ -4,9 +4,11 @@
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 <variable
name="data" name="data"
type="com.example.haiwei_mom.data.SemiInVo" /> type="com.example.haiwei_mom.data.SemiInVo" />
@ -16,8 +18,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".wms.semi.SemiInActivity" android:orientation="vertical"
android:orientation="vertical"> tools:context=".wms.semi.SemiInActivity">
<include <include
layout="@layout/toolbar" layout="@layout/toolbar"
app:title='@{title??"半成品入库"}' /> app:title='@{title??"半成品入库"}' />
@ -40,10 +43,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:drawableRight="@mipmap/icon_chaxun" android:drawableRight="@mipmap/icon_chaxun"
android:text="@={data.shelfNo}" android:imeOptions="actionSearch"
/> android:inputType="text"
android:lines="1"
android:maxLines="1"
android:text="@={data.shelfNo}" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
@ -60,10 +67,11 @@
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.cardNo}"/> android:text="@{data.cardNo}" />
<!-- android:text="@{vo.materialName}"--> <!-- android:text="@{vo.materialName}"-->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
@ -80,7 +88,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="@{data.materialCode}"/> android:text="@{data.materialCode}" />
<!-- android:text="@{vo.materialName}"--> <!-- android:text="@{vo.materialName}"-->
</LinearLayout> </LinearLayout>
@ -101,7 +109,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="@{data.materialSpec}"/> android:text="@{data.materialSpec}" />
</LinearLayout> </LinearLayout>
@ -121,9 +129,18 @@
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='@{String.valueOf(data.instockNum)??"0"}'/> android:layout_weight="1"
android:text='@{String.valueOf(data.instockNum)??"0"}' />
<TextView
style="@style/text_info"
android:layout_width="80dp"
android:layout_height="match_parent"
android:layout_marginStart="2dp"
android:text='@{data.unitName}' />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -142,32 +159,31 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="45dp" android:minHeight="45dp"
android:text="@={data.storePlaceCode}" android:text="@={data.storePlaceCode}" />
/>
</LinearLayout> </LinearLayout>
<!-- <LinearLayout--> <!-- <LinearLayout-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="45dp"--> <!-- android:layout_height="45dp"-->
<!-- android:layout_marginTop="20dp"--> <!-- android:layout_marginTop="20dp"-->
<!-- android:layout_marginEnd="4dp">--> <!-- android:layout_marginEnd="4dp">-->
<!-- <TextView--> <!-- <TextView-->
<!-- style="@style/text_title"--> <!-- style="@style/text_title"-->
<!-- android:layout_width="90dp"--> <!-- android:layout_width="90dp"-->
<!-- android:layout_height="match_parent"--> <!-- android:layout_height="match_parent"-->
<!-- android:text="输入数量:" />--> <!-- android:text="输入数量:" />-->
<!-- <EditText--> <!-- <EditText-->
<!-- style="@style/text_edit"--> <!-- style="@style/text_edit"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"--> <!-- android:layout_height="match_parent"-->
<!-- android:inputType="numberDecimal"--> <!-- android:inputType="numberDecimal"-->
<!-- />--> <!-- />-->
<!-- </LinearLayout>--> <!-- </LinearLayout>-->
<Button <Button
style="@style/button_style" style="@style/button_style"

3
app/src/main/res/layout/activity_semi_out.xml
Unescape Escape View File

@ -42,6 +42,9 @@
style="@style/text_san" style="@style/text_san"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:lines="1"
android:inputType="text"
android:imeOptions="actionSearch"
android:drawableRight="@mipmap/icon_chaxun" /> android:drawableRight="@mipmap/icon_chaxun" />
</LinearLayout> </LinearLayout>

BIN
app/src/main/res/mipmap-hdpi/submit.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 930 B

9
app/src/main/res/values/themes.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Base.Theme.Haiweimom" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Base.Theme.Haiweimom" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your light theme here. --> <!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> --> <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
<item name="colorPrimary">@color/blue</item> <item name="colorPrimary">@color/blue</item>
<item name="android:windowBackground">@color/activity_bg</item> <item name="android:windowBackground">@color/activity_bg</item>
</style> </style>
@ -27,6 +27,13 @@
<item name="android:textColor">@color/black</item> <item name="android:textColor">@color/black</item>
<item name="android:background">@drawable/text_bg</item> <item name="android:background">@drawable/text_bg</item>
</style> </style>
<style name="text_info2">
<item name="android:textSize">18sp</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@color/black</item>
<item name="android:background">@drawable/text_bg2</item>
</style>
<style name="text_edit"> <style name="text_edit">
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>

Write Preview
Loading…
Cancel
Save