From adec6cfa17fecfb8175998910b78cef175810db7 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 26 Jan 2024 14:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=A7=E6=96=99?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/duken_mes/MainActivity.java | 42 +++++++++++++++---- .../example/duken_mes/base/BaseActivity.java | 3 +- .../example/duken_mes/entity/Material.java | 35 ++++++++++++++++ app/src/main/res/layout/activity_main.xml | 2 +- 4 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/com/example/duken_mes/entity/Material.java diff --git a/app/src/main/java/com/example/duken_mes/MainActivity.java b/app/src/main/java/com/example/duken_mes/MainActivity.java index 89a3e64..97166b8 100644 --- a/app/src/main/java/com/example/duken_mes/MainActivity.java +++ b/app/src/main/java/com/example/duken_mes/MainActivity.java @@ -15,6 +15,7 @@ import com.example.duken_mes.base.MyRecultCall; import com.example.duken_mes.base.MyResult; import com.example.duken_mes.databinding.ActivityMainBinding; import com.example.duken_mes.entity.IngredientInfo; +import com.example.duken_mes.entity.Material; import com.example.duken_mes.vm.MainVm; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; @@ -30,13 +31,12 @@ public class MainActivity extends BaseActivity { super.onCreate(savedInstanceState); ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main); mainVm = new MainVm(); - mainVm.setGoodsCode("物料编码"); - mainVm.setGoodsName("物料名称"); - mainVm.setGoodsNumber("100"); - mainVm.setType(getIntent().getBooleanExtra("type", false)); + var type = getIntent().getBooleanExtra("type", false); + mainVm.setType(type); binding.setVm(mainVm); binding.trayCodeid.setOnEditorActionListener((v, actionId, event) -> { - mainVm.setGoodsVis(true); + selectGoods(); + /*if (actionId == EditorInfo.IME_ACTION_DONE) { InputMethodManager imm = (InputMethodManager)v.getContext() .getSystemService(Context.INPUT_METHOD_SERVICE); @@ -75,7 +75,7 @@ public class MainActivity extends BaseActivity { mainVm.setTankCode(code); } else { mainVm.setTrayCode(code); - mainVm.setGoodsVis(true); + selectGoods(); } @@ -117,7 +117,8 @@ public class MainActivity extends BaseActivity { } alertDialog.show(); } - private void submitRequest(){ + + private void submitRequest() { var type = mainVm.isType(); Log.e("TAG", "submitRequest:" + type); if (type) { @@ -133,7 +134,7 @@ public class MainActivity extends BaseActivity { } - OkGo.post(url + "/api/IngCheck/" + (type ?"SmallMaterial": "BigMaterial" )) + OkGo.post(url + "/api/IngCheck/" + (type ? "SmallMaterial" : "BigMaterial")) .tag(this) .upRequestBody(RequestBody.create(JSON, gson.toJson(ingredientInfo))) .execute(new MyRecultCall(dialog, this) { @@ -154,4 +155,29 @@ public class MainActivity extends BaseActivity { public void backAc(View view) { finish(); } + private void selectGoods(){ + OkGo.get(url + "/api/IngCheck/GetMcsMaterialInfo/" + mainVm.getTrayCode()) + .tag(this) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getStatusCode()==200){ + if (mainVm.isType()){ + + }else { + // 大料 + var material=gson.fromJson(body.getMessage(), Material.class); + mainVm.setGoodsCode(material.getMatCode()); + mainVm.setGoodsName(material.getMatName()); + mainVm.setGoodsNumber(material.getMatType()); + mainVm.setGoodsVis(true); + } + }else { + Toast.makeText(MainActivity.this, body.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/duken_mes/base/BaseActivity.java b/app/src/main/java/com/example/duken_mes/base/BaseActivity.java index 3931231..f56ee07 100644 --- a/app/src/main/java/com/example/duken_mes/base/BaseActivity.java +++ b/app/src/main/java/com/example/duken_mes/base/BaseActivity.java @@ -16,7 +16,8 @@ import com.google.gson.Gson; import okhttp3.MediaType; public abstract class BaseActivity extends AppCompatActivity { - public static String url = "http://175.27.215.92:6089"; + // public static String url = "http://175.27.215.92:6089"; + public static String url = "http://10.11.41.121:6089"; public ProgressDialog dialog; public Gson gson; public MediaType JSON = MediaType.parse("application/json; charset=utf-8"); diff --git a/app/src/main/java/com/example/duken_mes/entity/Material.java b/app/src/main/java/com/example/duken_mes/entity/Material.java new file mode 100644 index 0000000..36ece19 --- /dev/null +++ b/app/src/main/java/com/example/duken_mes/entity/Material.java @@ -0,0 +1,35 @@ +package com.example.duken_mes.entity; + +/** + * @author wanghao + * @date 2024/1/26 13:52 + */ +public class Material { + private String MatCode; + private String MatName; + private String MatType; + + public String getMatCode() { + return MatCode; + } + + public void setMatCode(String matCode) { + MatCode = matCode; + } + + public String getMatName() { + return MatName; + } + + public void setMatName(String matName) { + MatName = matName; + } + + public String getMatType() { + return MatType; + } + + public void setMatType(String matType) { + MatType = matType; + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f835c09..02d02b8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -191,7 +191,7 @@ style="@style/name_style3" android:layout_width="80dp" android:layout_height="match_parent" - android:text="物料数量:" /> + android:text="物料类型:" />