diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0817731..6ce514a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,6 +15,9 @@ android:theme="@style/Theme.Haiweimom" android:usesCleartextTraffic="true" tools:targetApi="31"> + diff --git a/app/src/main/java/com/example/haiwei_mom/wms/raw/CheckWorkActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/raw/CheckWorkActivity.java index 8f8ddf0..5891d63 100644 --- a/app/src/main/java/com/example/haiwei_mom/wms/raw/CheckWorkActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/wms/raw/CheckWorkActivity.java @@ -35,6 +35,8 @@ public class CheckWorkActivity extends BaseActivity { private List inventorylist; private CheckWorkAdapter checkWorkAdapter; private CheckRecordVo checkRecordVo; + private String checkCode; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -42,7 +44,7 @@ public class CheckWorkActivity extends BaseActivity { Intent intent = getIntent(); list = Arrays.asList(intent.getStringArrayExtra("list")); binding.setList(list); - String checkCode = intent.getStringExtra("code"); + checkCode = intent.getStringExtra("code"); binding.setCode(checkCode); binding.workListSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override @@ -56,9 +58,9 @@ public class CheckWorkActivity extends BaseActivity { } }); - checkWorkAdapter=new CheckWorkAdapter(this); + checkWorkAdapter = new CheckWorkAdapter(this); binding.setAdapter(checkWorkAdapter); - checkRecordVo=new CheckRecordVo(); + checkRecordVo = new CheckRecordVo(); checkRecordVo.setCheckCode(checkCode); binding.setData(checkRecordVo); } @@ -84,16 +86,37 @@ public class CheckWorkActivity extends BaseActivity { }); } - public void storeCheckWork(View view){ + // 完成 + public void storeCheckWorkOver(View view) { + OkGo.post(url + "/wms/pda/storeCheck/storeCheckWorkOver") + .params("checkCode", checkCode) + .execute(new MyRecultCall(dialog, this) { + + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + finish(); + Toast.makeText(CheckWorkActivity.this, "提交成功", Toast.LENGTH_SHORT).show(); + return; + } + myToastUitls.show(body.getMsg()); + } + }); + } + + // 提交 + public void storeCheckWork(View view) { String batchCode = checkRecordVo.getBatchCode(); - WmsInventoryVo wmsInventoryVo= inventorylist.stream().filter(t->t.getBatchCode().equals(batchCode)).findFirst().get(); + WmsInventoryVo wmsInventoryVo = inventorylist.stream().filter(t -> t.getBatchCode().equals(batchCode)).findFirst().get(); checkRecordVo.setMaterialCode(wmsInventoryVo.getMaterialCode()); checkRecordVo.setLocationCode(wmsInventoryVo.getLocationCode()); checkRecordVo.setInventoryQty(wmsInventoryVo.getInventoryQty()); checkRecordVo.setMaterialName(wmsInventoryVo.getMaterialName()); OkGo.post(url + "/wms/pda/storeCheck/submitCheckRecord") - .upRequestBody(RequestBody.create(JSON,gson.toJson(checkRecordVo))) + .upRequestBody(RequestBody.create(JSON, gson.toJson(checkRecordVo))) .execute(new MyRecultCall(dialog, this) { @Override diff --git a/app/src/main/java/com/example/haiwei_mom/wms/raw/StoreCheckActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/raw/StoreCheckActivity.java index 8ba1288..c166cc3 100644 --- a/app/src/main/java/com/example/haiwei_mom/wms/raw/StoreCheckActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/wms/raw/StoreCheckActivity.java @@ -134,10 +134,10 @@ public class StoreCheckActivity extends BaseActivity { if (body.getCode() == 200) { WmsInventoryCheck wmsInventoryCheck=gson.fromJson(body.getDataJson(),WmsInventoryCheck.class); String[] array = list.toArray(new String[0]); - intent.putExtra("list",array); intent.putExtra("code",wmsInventoryCheck.getCheckCode()); startActivity(intent); + finish(); return; } myToastUitls.show(body.getMsg()); diff --git a/app/src/main/java/com/example/haiwei_mom/wms/semi/SeimMoveActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/semi/SeimMoveActivity.java new file mode 100644 index 0000000..33d4e28 --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/wms/semi/SeimMoveActivity.java @@ -0,0 +1,18 @@ +package com.example.haiwei_mom.wms.semi; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.bigkoo.pickerview.view.OptionsPickerView; +import com.example.haiwei_mom.R; +import com.example.haiwei_mom.base.BaseActivity; + +public class SeimMoveActivity extends BaseActivity { + private OptionsPickerView opv; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_seim_move); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_work.xml b/app/src/main/res/layout/activity_check_work.xml index f9813f8..cfa7abf 100644 --- a/app/src/main/res/layout/activity_check_work.xml +++ b/app/src/main/res/layout/activity_check_work.xml @@ -135,7 +135,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:onClick="storeCheck2" + android:onClick="storeCheckWorkOver" android:text="完成盘点" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_seim_move.xml b/app/src/main/res/layout/activity_seim_move.xml new file mode 100644 index 0000000..dd947f3 --- /dev/null +++ b/app/src/main/res/layout/activity_seim_move.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +