diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c3e3095..cacf36a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,6 +32,11 @@ + + + diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java index 392712a..c6aca22 100644 --- a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckSelectAdapter.java @@ -11,9 +11,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.example.haiwei_mom.BR; import com.example.haiwei_mom.R; import com.example.haiwei_mom.adapter.ItemClickCall; -import com.example.haiwei_mom.data.check.QmsTaskItemBeen; +import com.example.haiwei_mom.data.check.QcInspectionMain; import com.example.haiwei_mom.databinding.ItemCheckSelectBinding; -import com.example.haiwei_mom.data.check.CheckResult; import java.util.List; @@ -22,7 +21,7 @@ import java.util.List; * @date 2024/1/31 15:18 */ public class CheckSelectAdapter extends RecyclerView.Adapter { - private List list; + private List list; private Context context; private LayoutInflater inflater; private ItemClickCall clickCall; @@ -32,7 +31,7 @@ public class CheckSelectAdapter extends RecyclerView.Adapter list) { + public void setList(List list) { this.list = list; } diff --git a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java index 35287a6..2f16071 100644 --- a/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java +++ b/app/src/main/java/com/example/haiwei_mom/adapter/check/CheckWorkAdapter.java @@ -9,6 +9,7 @@ import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.RecyclerView; import com.example.haiwei_mom.R; +import com.example.haiwei_mom.data.check.QcInspectionResult; import com.example.haiwei_mom.databinding.ItemCheck1Binding; import com.example.haiwei_mom.databinding.ItemCheck2Binding; import com.example.haiwei_mom.data.check.CheckResultDetal; @@ -20,7 +21,7 @@ import java.util.List; * @date 2024/3/1 17:23 */ public class CheckWorkAdapter extends RecyclerView.Adapter { - private List list; + private List list; private Context context; private boolean enabledState; @@ -32,7 +33,7 @@ public class CheckWorkAdapter extends RecyclerView.Adapter list) { + public void setList(List list) { this.list = list; } @@ -40,7 +41,7 @@ public class CheckWorkAdapter extends RecyclerView.Adapter filesList; + private List files; + private ImgDialog imgDialog; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_check); adapter = new CheckWorkAdapter(this); + adapter.setEnabledState(true); binding.setAdapter(adapter); var intent = getIntent(); - var id = intent.getStringExtra("id"); - if (id != null) { - var visble = intent.getBooleanExtra("visble", true); - binding.checkSearchLinear.setVisibility(View.GONE); - Log.e("TAG", "传值:" + visble); - searchRequest(null, id, visble); - } + checkResult= (QcInspectionMain) intent.getSerializableExtra("checkResult"); + binding.setVm(checkResult); + searchRequest(checkResult.getInspectionId()); + + adapter1 = new DisposalFileAdapter(this, this); + filesList = new ArrayList<>(); + files = new ArrayList<>(); + adapter1.setList(filesList); + binding.setAdapter1(adapter1); + imgDialog = new ImgDialog(this); + + // var id = intent.getStringExtra("id"); + // if (id != null) { + // var visble = intent.getBooleanExtra("visble", true); + // binding.checkSearchLinear.setVisibility(View.GONE); + // Log.e("TAG", "传值:" + visble); + // searchRequest(null, id, visble); + // } } // 提交 public void checkSubmit(View view) { - checkResult.setMaterialBarcode(binding.checkSearchText.getText().toString()); - OkGo.post(url + "/qms/mobile/saveCheckResultDetail") - .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) - .upRequestBody(RequestBody.create(JSON, gson.toJson(checkResult))) - .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - var body = response.body(); - if (body.getCode() == 200) { - finish(); - } - - myToastUitls.show( body.getMsg()); - } - }); + // checkResult.setMaterialBarcode(binding.checkSearchText.getText().toString()); + // OkGo.post(url + "/qms/mobile/saveCheckResultDetail") + // .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) + // .upRequestBody(RequestBody.create(JSON, gson.toJson(checkResult))) + // .execute(new MyRecultCall(dialog, this) { + // @Override + // public void onSuccess(Response response) { + // super.onSuccess(response); + // var body = response.body(); + // if (body.getCode() == 200) { + // finish(); + // } + // + // myToastUitls.show( body.getMsg()); + // } + // }); } public void checkSearch(View view) { - var serchText = binding.checkSearchText.getText().toString(); - searchRequest(serchText, null, true); + // var serchText = binding.checkSearchText.getText().toString(); + // searchRequest(serchText, null, true); } - private void searchRequest(String serchText, String id, boolean status) { - OkGo.get(url + "/qms/mobile/getCheckResultDetail") - .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) - .params("materialBarcode", serchText) - .params("checkResultDetailId", id) + private void searchRequest( Long id) { + OkGo.get(url + "/qms/qcMobile/getResultList") + .params("inspectionId", id) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override @@ -82,29 +104,61 @@ public class CheckActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - checkResult = gson.fromJson(body.getData().toString(), CheckResult.class); - checkResult.setVisbleStatus(status); - binding.setVm(checkResult); - List qmsCheckResultDetailProjectList; - - qmsCheckResultDetailProjectList = checkResult.getQmsCheckResultDetailProjectList(); - if (qmsCheckResultDetailProjectList == null || qmsCheckResultDetailProjectList.isEmpty()) { - qmsCheckResultDetailProjectList = new ArrayList<>(); - var qmsCheckRuleProjectList = checkResult.getQmsCheckRuleProjectList(); - qmsCheckResultDetailProjectList.addAll(qmsCheckRuleProjectList); - checkResult.setQmsCheckResultDetailProjectList(qmsCheckResultDetailProjectList); - } - adapter.setEnabledState(status); - adapter.setList(qmsCheckResultDetailProjectList); + List list=gson.fromJson(body.getDataJson(),new TypeToken>(){}.getType()); + // checkResult = gson.fromJson(body.getData().toString(), CheckResult.class); + // checkResult.setVisbleStatus(status); + // binding.setVm(checkResult); + // List qmsCheckResultDetailProjectList; + // + // qmsCheckResultDetailProjectList = checkResult.getQmsCheckResultDetailProjectList(); + // if (qmsCheckResultDetailProjectList == null || qmsCheckResultDetailProjectList.isEmpty()) { + // qmsCheckResultDetailProjectList = new ArrayList<>(); + // var qmsCheckRuleProjectList = checkResult.getQmsCheckRuleProjectList(); + // qmsCheckResultDetailProjectList.addAll(qmsCheckRuleProjectList); + // checkResult.setQmsCheckResultDetailProjectList(qmsCheckResultDetailProjectList); + // } + // adapter.setEnabledState(status); + adapter.setList(list); adapter.notifyDataSetChanged(); - } else { - binding.setVm(null); - adapter.setList(null); - adapter.notifyDataSetChanged(); - myToastUitls.show( body.getMsg()); + return; } + // binding.setVm(null); + // adapter.setList(null); + // adapter.notifyDataSetChanged(); + myToastUitls.show( body.getMsg()); + } }); } + public void tackphoto(View view) { + try { + teke_photo(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + + } + @SuppressLint("NotifyDataSetChanged") + @Override + public void tekePhotoResult(String fileUrl, File file) { + super.tekePhotoResult(fileUrl, file); + CheckInstanceFiles checkInstanceFiles = new CheckInstanceFiles(); + checkInstanceFiles.setFaultFile(fileUrl); + checkInstanceFiles.setState(true); + filesList.add(checkInstanceFiles); + adapter1.notifyDataSetChanged(); + files.add(file); + } + @Override + public void onClick(int position, boolean type) { + if (type) { + imgDialog.setRawReturn(filesList.get(position).getFaultFile()); + return; + } + filesList.remove(position); + files.remove(position); + adapter1.notifyDataSetChanged(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/check/CheckSelectActivity.java b/app/src/main/java/com/example/haiwei_mom/check/CheckSelectActivity.java index 99bf011..b74b8ab 100644 --- a/app/src/main/java/com/example/haiwei_mom/check/CheckSelectActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/check/CheckSelectActivity.java @@ -15,10 +15,8 @@ import com.example.haiwei_mom.adapter.check.CheckSelectAdapter; 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.check.QmsTaskItemBeen; +import com.example.haiwei_mom.data.check.QcInspectionMain; import com.example.haiwei_mom.databinding.ActivityCheckSelectBinding; -import com.example.haiwei_mom.data.check.CheckResult; -import com.example.haiwei_mom.uitls.SharedPreferencesUtils; import com.google.gson.reflect.TypeToken; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; @@ -26,9 +24,9 @@ import com.lzy.okgo.model.Response; import java.util.List; public class CheckSelectActivity extends BaseActivity implements ItemClickCall { - private List list; + private List list; private CheckSelectAdapter adapter; - private Intent intent1; + private Intent intent; private boolean activityType; @Override @@ -40,7 +38,7 @@ public class CheckSelectActivity extends BaseActivity implements ItemClickCall { var title = getIntent().getStringExtra("title"); binding.setTitle(title); activityType = title.equals("物料质检列表"); - intent1 = new Intent(this, activityType ? CheckSelectDetalActivity.class : CheckDisposalActivity.class); + intent = new Intent(this, CheckActivity.class); binding.checkSelectItemSelect.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -63,7 +61,7 @@ public class CheckSelectActivity extends BaseActivity implements ItemClickCall { } private void initTaskListRequest(String checkRuleType) { - OkGo.get(url + "/qms/QcInspectionMain/list").tag(this) + OkGo.get(url + "/qms/qcMobile/getMainList").tag(this) // .params("checkStatus", activityType ? null : "3") // .params("checkRuleType", checkRuleType) @@ -82,7 +80,7 @@ public class CheckSelectActivity extends BaseActivity implements ItemClickCall { return; } - list = gson.fromJson(gson.toJson(body.getRows()), new TypeToken>() { + list = gson.fromJson(gson.toJson(body.getRows()), new TypeToken>() { }.getType()); adapter.setList(list); adapter.notifyDataSetChanged(); @@ -93,19 +91,8 @@ public class CheckSelectActivity extends BaseActivity implements ItemClickCall { @Override public void onClick(int position) { var checkResult = list.get(position); - // var checkResultId = checkResult.getCheckResultId(); - // var checkMode = checkResult.getCheckModeText(); - // Log.e("TAG", "onClick:" + checkMode); - // var checkSample = checkResult.getCheckSample(); - // var materialBatch = checkResult.getMaterialBatch(); - // intent1.putExtra("checkResultId", checkResultId); - // intent1.putExtra("checkMode", checkMode); - // intent1.putExtra("checkSample", checkSample); - // intent1.putExtra("materialBatch", materialBatch); - // intent1.putExtra("materialCode", checkResult.getMaterialCode()); - // intent1.putExtra("materialName", checkResult.getMaterialName()); - // intent1.putExtra("checkRuleType", checkResult.getCheckRuleType()); - startActivity(intent1); + intent.putExtra("checkResult", checkResult); + startActivity(intent); } diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/QmsTaskItemBeen.java b/app/src/main/java/com/example/haiwei_mom/data/check/QcInspectionMain.java similarity index 60% rename from app/src/main/java/com/example/haiwei_mom/data/check/QmsTaskItemBeen.java rename to app/src/main/java/com/example/haiwei_mom/data/check/QcInspectionMain.java index 8764386..e587ab1 100644 --- a/app/src/main/java/com/example/haiwei_mom/data/check/QmsTaskItemBeen.java +++ b/app/src/main/java/com/example/haiwei_mom/data/check/QcInspectionMain.java @@ -1,79 +1,185 @@ package com.example.haiwei_mom.data.check; -public class QmsTaskItemBeen { + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + + +/** + * 质检任务业务对象 qc_inspection_main + * + * @author zch + * @String 2025-07-24 + */ + +public class QcInspectionMain implements Serializable { + + /** + * 质检主键 + */ + private Long inspectionId; /** - * inspectionId : 1948615722050088962 - * planDetailId : 12 - * inspectionNo : ZL202507250008 - * templateId : 30001 - * materialCode : 014001200 - * materialType : null - * materialName : 雪莲12.00R2020PRKT216 - * processName : 硫化 - * stationName : 硫化001 - * inspectionQty : 1.00 - * qualifiedQty : null - * unqualifiedQty : null - * result : null - * workshop : null - * inspectionType : 6 - * status : 0 - * inspector : null - * shift : 早 - * team : 丁班 - * inspectionStartTime : 2025-07-21 00:00:00 - * inspectionEndTime : null - * productionOrder : 20250724104058PL0009 - * batchNo : null - * barcode : 20250724LH001010015 - * supplierName : null - * remark : null - * templateName : 轮胎终检模板 + * 计划详情id（或许来源于mes） */ + private Long planDetailId; - private String inspectionId; - private String planDetailId; + + /** + * 检测单号/卡号 + */ private String inspectionNo; - private String templateId; - private String materialCode; - private String materialType; - private String materialName; - private String processName; - private String stationName; - private String inspectionQty; - private String qualifiedQty; - private String unqualifiedQty; - private String result; - private String workshop; - private String inspectionType; - private String status; - private String inspector; - private String shift; - private String team; - private String inspectionStartTime; - private String inspectionEndTime; - private String productionOrder; - private String batchNo; - private String barcode; - private String supplierName; - private String remark; - private String templateName; - public String getInspectionId() { + /** + * 关联模板主表ID + */ + private Long templateId; + + /** + * 物料编码 + */ + private String materialCode; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 工序名称 + */ + private String processName; + + /** + * 工位名称 + */ + private String stationName; + + /** + * 质检数量 + */ + private BigDecimal inspectionQty; + + /** + * 合格数 + */ + private BigDecimal qualifiedQty; + + /** + * 不合格数 + */ + private BigDecimal unqualifiedQty; + + /** + * 质检结果（0合格/1不合格） + */ + private String result; + + /** + * 车间 + */ + private String workshop; + + /** + * 检测类型ID + */ + private Long inspectionType; + + /** + * 单据状态（0未处理/1完成） + */ + private String status; + + /** + * 检测人员 + */ + private String inspector; + + /** + * 班次 + */ + private String shift; + + /** + * 班组 + */ + private String team; + + /** + * 检验开始时间 + */ + private String inspectionStartTime; + + /** + * 检验结束时间 + */ + private String inspectionEndTime; + + /** + * 生产订单号 + */ + private String productionOrder; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 条码号 + */ + private String barcode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 备注 + */ + private String remark; + + /** + * 模板名称 + */ + private String templateName;//join + + /** + * 检测类型字典 + */ + private String qcInspectionType; + + /** + * 检测类型名称 + */ + private String typeName; + + /** + * 检测结果列表 + */ + private List results; + + public Long getInspectionId() { return inspectionId; } - public void setInspectionId(String inspectionId) { + public void setInspectionId(Long inspectionId) { this.inspectionId = inspectionId; } - public String getPlanDetailId() { + public Long getPlanDetailId() { return planDetailId; } - public void setPlanDetailId(String planDetailId) { + public void setPlanDetailId(Long planDetailId) { this.planDetailId = planDetailId; } @@ -85,11 +191,11 @@ public class QmsTaskItemBeen { this.inspectionNo = inspectionNo; } - public String getTemplateId() { + public Long getTemplateId() { return templateId; } - public void setTemplateId(String templateId) { + public void setTemplateId(Long templateId) { this.templateId = templateId; } @@ -133,27 +239,27 @@ public class QmsTaskItemBeen { this.stationName = stationName; } - public String getInspectionQty() { + public BigDecimal getInspectionQty() { return inspectionQty; } - public void setInspectionQty(String inspectionQty) { + public void setInspectionQty(BigDecimal inspectionQty) { this.inspectionQty = inspectionQty; } - public String getQualifiedQty() { + public BigDecimal getQualifiedQty() { return qualifiedQty; } - public void setQualifiedQty(String qualifiedQty) { + public void setQualifiedQty(BigDecimal qualifiedQty) { this.qualifiedQty = qualifiedQty; } - public String getUnqualifiedQty() { + public BigDecimal getUnqualifiedQty() { return unqualifiedQty; } - public void setUnqualifiedQty(String unqualifiedQty) { + public void setUnqualifiedQty(BigDecimal unqualifiedQty) { this.unqualifiedQty = unqualifiedQty; } @@ -173,11 +279,11 @@ public class QmsTaskItemBeen { this.workshop = workshop; } - public String getInspectionType() { + public Long getInspectionType() { return inspectionType; } - public void setInspectionType(String inspectionType) { + public void setInspectionType(Long inspectionType) { this.inspectionType = inspectionType; } @@ -276,4 +382,28 @@ public class QmsTaskItemBeen { public void setTemplateName(String templateName) { this.templateName = templateName; } + + public String getQcInspectionType() { + return qcInspectionType; + } + + public void setQcInspectionType(String qcInspectionType) { + this.qcInspectionType = qcInspectionType; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public List getResults() { + return results; + } + + public void setResults(List results) { + this.results = results; + } } diff --git a/app/src/main/java/com/example/haiwei_mom/data/check/QcInspectionResult.java b/app/src/main/java/com/example/haiwei_mom/data/check/QcInspectionResult.java new file mode 100644 index 0000000..8d9eb86 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/check/QcInspectionResult.java @@ -0,0 +1,318 @@ +package com.example.haiwei_mom.data.check; + + +import android.text.Editable; +import android.util.Log; + +import androidx.databinding.BaseObservable; + +import java.math.BigDecimal; + +/** + * 质检结果子表业务对象 qc_inspection_result + * + * @author zch + * @date 2025-07-24 + */ + +public class QcInspectionResult extends BaseObservable { + + /** + * 结果主键 + */ + private Long resultId; + + /** + * 关联质检主表ID + */ + private Long inspectionId; + + /** + * 关联检测项ID + */ + private Long itemId; + + /** + * 检测结果（0合格，1不合格，2未判定） + */ + private String detectResult; + private String detectResultName; + + public String getDetectResultName() { + if (detectResult==null || detectResult.isEmpty()) return "未判定"; + if (detectResult.equals("0")) return "合格"; + if (detectResult.equals("1")) return "不合格"; + + return null; + } + + public void click(String status){ + Log.e("TAG", "click:" + status); + setDetectResult(status); + } + + + /** + * 定量检测值 + */ + private String detectValue; + + public void textChanged(Editable s){ + double result=Double.parseDouble(s.toString()); + detectValue=result+""; + if (result>=upperLimit && result<= lowerLimit){ + setDetectResult("0"); + }else { + setDetectResult("1"); + } + } + + /** + * 规格质检值 + */ + private String specInspection; + + /** + * 定性不合格明细 + */ + private String problemDetail; + + /** + * 检测项编码（快照） + */ + private String itemCode; + + /** + * 检测项名称（快照） + */ + private String itemName; + + /** + * 检测位置（快照） + */ + private String inspectionPosition; + + /** + * 检测项目类别（快照） + */ + private String categoryName; + + /** + * 关联检测类型表（快照） + */ + private Long typeId; + + /** + * 检测方式（0定性,1定量）（快照） + */ + private String detectType; + + /** + * 控制类型(0手动,1自动)（快照） + */ + private String controlType; + + /** + * 标准值（快照） + */ + private BigDecimal standardValue; + + /** + * 控制上限（快照） + */ + private double upperLimit; + + /** + * 控制下限（快照） + */ + private double lowerLimit; + + /** + * 规格名称（快照） + */ + private String specName; + + /** + * 规格上限（快照） + */ + private String specUpper; + + /** + * 规格下限（快照） + */ + private String specLower; + + /** + * 检测项说明（快照） + */ + private String description; + + public Long getResultId() { + return resultId; + } + + public void setResultId(Long resultId) { + this.resultId = resultId; + } + + public Long getInspectionId() { + return inspectionId; + } + + public void setInspectionId(Long inspectionId) { + this.inspectionId = inspectionId; + } + + public Long getItemId() { + return itemId; + } + + public void setItemId(Long itemId) { + this.itemId = itemId; + } + + public String getDetectResult() { + return detectResult; + } + + public void setDetectResult(String detectResult) { + this.detectResult = detectResult; + notifyChange(); + } + + public String getDetectValue() { + return detectValue; + } + + public void setDetectValue(String detectValue) { + this.detectValue = detectValue; + } + + public String getSpecInspection() { + return specInspection; + } + + public void setSpecInspection(String specInspection) { + this.specInspection = specInspection; + } + + public String getProblemDetail() { + return problemDetail; + } + + public void setProblemDetail(String problemDetail) { + this.problemDetail = problemDetail; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getInspectionPosition() { + return inspectionPosition; + } + + public void setInspectionPosition(String inspectionPosition) { + this.inspectionPosition = inspectionPosition; + } + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public Long getTypeId() { + return typeId; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public String getDetectType() { + return detectType; + } + + public void setDetectType(String detectType) { + this.detectType = detectType; + } + + public String getControlType() { + return controlType; + } + + public void setControlType(String controlType) { + this.controlType = controlType; + } + + public BigDecimal getStandardValue() { + return standardValue; + } + + public void setStandardValue(BigDecimal standardValue) { + this.standardValue = standardValue; + } + + public double getUpperLimit() { + return upperLimit; + } + + public void setUpperLimit(double upperLimit) { + this.upperLimit = upperLimit; + } + + public double getLowerLimit() { + return lowerLimit; + } + + public void setLowerLimit(double lowerLimit) { + this.lowerLimit = lowerLimit; + } + + public String getSpecName() { + return specName; + } + + public void setSpecName(String specName) { + this.specName = specName; + } + + public String getSpecUpper() { + return specUpper; + } + + public void setSpecUpper(String specUpper) { + this.specUpper = specUpper; + } + + public String getSpecLower() { + return specLower; + } + + public void setSpecLower(String specLower) { + this.specLower = specLower; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index 11eaf77..3b72d24 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -4,16 +4,25 @@ xmlns:tools="http://schemas.android.com/tools"> - + + + + type="com.example.haiwei_mom.data.check.QcInspectionMain" /> + - + + + + + + android:padding="4dp" + android:visibility="gone"> + android:hint="请 输入/扫描 物料条码" + android:paddingLeft="10dp" /> + android:layout_height="40dp"> + android:text='检测类型' /> - + android:text='@{vm.typeName}' /> + + + android:text='@{vm.inspectionNo}' /> + android:layout_height="40dp"> + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + +