diff --git a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java index bd32579..d0aab7f 100644 --- a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java @@ -23,6 +23,7 @@ import com.example.haiwei_mom.wms.raw.RawInActivity; import com.example.haiwei_mom.wms.raw.RawOutActivity; import com.example.haiwei_mom.wms.raw.RawReturnActivity; import com.example.haiwei_mom.wms.raw.StoreCheckActivity; +import com.example.haiwei_mom.wms.semi.SeimMoveActivity; import com.example.haiwei_mom.wms.semi.SemiInActivity; import com.example.haiwei_mom.wms.semi.SemiOutActivity; import com.google.gson.reflect.TypeToken; @@ -55,8 +56,8 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { map = new HashMap<>(); map.put("半成品入库", SemiInActivity.class); map.put("半成品出库", SemiOutActivity.class); - // map.put("半成品移库", SemiOutActivity.class); - // map.put("半成品盘点", SemiOutActivity.class); + map.put("半成品调拨", SeimMoveActivity.class); + map.put("半成品盘点", StoreCheckActivity.class); map.put("入库工装绑定", BindVehicleActivity.class); map.put("成品批量入库", ProductInActivity.class); map.put("成品出库", ProductOutActivity.class); diff --git a/app/src/main/java/com/example/haiwei_mom/data/SemiOutVo.java b/app/src/main/java/com/example/haiwei_mom/data/SemiOutVo.java index 1159e44..c06342f 100644 --- a/app/src/main/java/com/example/haiwei_mom/data/SemiOutVo.java +++ b/app/src/main/java/com/example/haiwei_mom/data/SemiOutVo.java @@ -129,4 +129,8 @@ public class SemiOutVo extends BaseObservable { this.outNumber = outNumber; notifyChange(); } + + public Long getObjId() { + return objId; + } } diff --git a/app/src/main/java/com/example/haiwei_mom/data/WmsHppStorePlaceVo.java b/app/src/main/java/com/example/haiwei_mom/data/WmsHppStorePlaceVo.java new file mode 100644 index 0000000..08a93aa --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/WmsHppStorePlaceVo.java @@ -0,0 +1,69 @@ +package com.example.haiwei_mom.data; + +/** + * 半成品库位视图对象 wms_hpp_store_place + + */ + +public class WmsHppStorePlaceVo { + + + + /** + * 主键id + */ + private Long objId; + + /** + * 库位名 + */ + + private String storePlaceName; + + /** + * 库位代码 + */ + + private String storePlaceCode; + + /** + * 仓库id + */ + + private Long storeId; + + /** + * 使用状态 + */ + + private String usedFlag; + + /** + * 特殊库位 + */ + + private String specitialType; + + /** + * 位置类型 + */ + + private String positionType; + + /** + * 仓库名 + */ + private String storeName; + + public String getStorePlaceCode() { + return storePlaceCode; + } + + public String getStoreName() { + return storeName; + } + + public Long getObjId() { + return objId; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java b/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java index 413e975..9d30396 100644 --- a/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/ipc/FeedingMaterialsActivity.java @@ -4,19 +4,70 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; +import android.annotation.SuppressLint; import android.os.Bundle; import com.example.haiwei_mom.R; 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.WmsInventoryVo; import com.example.haiwei_mom.databinding.ActivityFeedingMaterialsBinding; +import com.example.haiwei_mom.ipc.data.MachinePlan; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.List; public class FeedingMaterialsActivity extends BaseActivity { private ActivityFeedingMaterialsBinding binding; + private MachinePlan machinePlan; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_feeding_materials); String title = getIntent().getStringExtra("title"); binding.setTitle(title); + initRequest(); + } + + private void initRequest() { + OkGo.post("http://"+SharedPreferencesUtils.getstring("machineIp",null) + "/api/plan/sel") + .params("machineNo", SharedPreferencesUtils.getstring("machineNo",null)) + .execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + + return; + } + myToastUitls.show(body.getMsg()); + } + }); + } + + @Override + public void getScannerData(String data) { + super.getScannerData(data); + OkGo.post("http://"+SharedPreferencesUtils.getstring("machineIp",null) + "/api/semi_product/scan") + .params("machineNo", SharedPreferencesUtils.getstring("machineNo",null)) + .execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + + return; + } + myToastUitls.show(body.getMsg()); + } + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java b/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java new file mode 100644 index 0000000..545f92f --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/ipc/data/MachinePlan.java @@ -0,0 +1,21 @@ +package com.example.haiwei_mom.ipc.data; + +public class MachinePlan { + private String planCode,materialName; + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } +} diff --git a/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java b/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java index cda915b..dd098ee 100644 --- a/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/qm/CheckActivity.java @@ -44,7 +44,7 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte private List> options2; private List>> options3; private List topDefects; - private String stationCode; + private String stationCode; @Override protected void onCreate(Bundle savedInstanceState) { @@ -62,7 +62,7 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte } private void initView() { - ActivityCheckBinding binding=DataBindingUtil.setContentView(this, R.layout.activity_check); + ActivityCheckBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_check); checkViewModel = new CheckViewModel(); binding.setVm(checkViewModel); @@ -74,58 +74,52 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte } private void initStationSum() { - OkGo.post(url + "/api/pdaQueryQuantityNumber").tag(this) - - .params("stationCode", stationCode) - .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response 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()); - } - } + OkGo.post(url + "/api/pdaQueryQuantityNumber").tag(this).params("stationCode", stationCode).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response 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 public void getScannerData(String code) { super.getScannerData(code); - checkViewModel.setCode(code); - OkGo.post(url + "/api/check/query").tag(this) - - .params("code", code) - .params("station", stationCode) + OkGo.post(url + "/dev-api/api/pdaApi/getMateriallnfo" + code).tag(this) + // .params("code", code) + // .params("station", stationCode) .execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { super.onSuccess(response); var result = response.body(); if (result.getCode() == 200) { - checkViewModel.setName(result.getMsg()); + /* checkViewModel.setName(result.getMsg()); topDefects = gson.fromJson(gson.toJson(result.getData()), new TypeToken>() { }.getType()); if (topDefects == null || topDefects.isEmpty()) { Toast.makeText(CheckActivity.this, "本工位无需检查返修情况", Toast.LENGTH_SHORT).show(); return; } - checkViewModel.setButtonVisbleState(true); + checkViewModel.setButtonVisbleState(true);*/ // tipDialog.setList(topDefects); // tipDialog.show(); + return; - /*// 直接添加提交数据中submitList.addAll(defectBeens); - checkAdapter.notifyDataSetChanged();*/ - } else { - Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); } + myToastUitls.show(result.getMsg()); + } }); } @@ -141,37 +135,35 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte // } - public void checkSubmint1(View view) { getScannerData("B24031483025025351528"); } // 提交 + public void checkSubmint(View view) { if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return; checkViewModel.setList(submitList); checkViewModel.setMeasure(submitList.isEmpty() ? "3" : "1"); checkViewModel.setUserName(SharedPreferencesUtils.getstring("loginName", "pda01")); checkViewModel.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); - OkGo.post(url + "/api/checkSubmit").tag(this) - .upRequestBody(RequestBody.create(JSON, gson.toJson(checkViewModel))) - .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - var result = response.body(); - if (result.getCode() == 200) { - Toast.makeText(CheckActivity.this, "提交成功", Toast.LENGTH_SHORT).show(); - checkViewModel.setCode(null); - checkViewModel.setName(null); - checkViewModel.setDefect(null); - checkViewModel.setButtonVisbleState(false); - submitList.clear(); - checkAdapter.notifyDataSetChanged(); - initStationSum(); - } else { - Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); - } - } - }); + OkGo.post(url + "/api/checkSubmit").tag(this).upRequestBody(RequestBody.create(JSON, gson.toJson(checkViewModel))).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var result = response.body(); + if (result.getCode() == 200) { + Toast.makeText(CheckActivity.this, "提交成功", Toast.LENGTH_SHORT).show(); + checkViewModel.setCode(null); + checkViewModel.setName(null); + checkViewModel.setDefect(null); + checkViewModel.setButtonVisbleState(false); + submitList.clear(); + checkAdapter.notifyDataSetChanged(); + initStationSum(); + } else { + Toast.makeText(CheckActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); + } + } + }); } // 删除缺陷 @@ -185,57 +177,56 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte // 初始化-联动选择 private void initOptionpb(String stationCode) { opv = new OptionsPickerBuilder(this, this).build(); - OkGo.get(url + "/base/qualityInspectionItem/getQualityDefects/" + stationCode).tag(this) - .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - var body = response.body(); - Log.e("TAG", "onSuccess:" + body.toString()); - if (body.getCode() == 200) { - Toast.makeText(CheckActivity.this, "请求成功", Toast.LENGTH_SHORT).show(); - list = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { - }.getType()); - if (list == null || list.isEmpty()) { - Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); - return; - } - options1 = new ArrayList<>(); - options2 = new ArrayList<>(); - options3 = new ArrayList<>(); - list.forEach(defect -> { - String materialCategories = defect.getMaterialCategories(); - String materialSubclass = defect.getMaterialSubclass(); - String qualityDefectName = defect.getQualityDefectName(); - - if (!options1.contains(materialCategories)) { - options1.add(materialCategories); - } - int index1 = options1.indexOf(materialCategories); - if (options2.size() <= index1) { - options2.add(new ArrayList<>()); - } - if (!options2.get(index1).contains(materialSubclass)) { - options2.get(index1).add(materialSubclass); - } - int index2 = options2.get(index1).indexOf(materialSubclass); - if (options3.size() <= index1) { - options3.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); - } - }); - opv.setPicker(options1, options2, options3); - } else { - Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); - } + OkGo.get(url + "/base/qualityInspectionItem/getQualityDefects/" + stationCode).tag(this).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + Log.e("TAG", "onSuccess:" + body.toString()); + if (body.getCode() == 200) { + Toast.makeText(CheckActivity.this, "请求成功", Toast.LENGTH_SHORT).show(); + list = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { + }.getType()); + if (list == null || list.isEmpty()) { + Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); + return; } + options1 = new ArrayList<>(); + options2 = new ArrayList<>(); + options3 = new ArrayList<>(); + list.forEach(defect -> { + String materialCategories = defect.getMaterialCategories(); + String materialSubclass = defect.getMaterialSubclass(); + String qualityDefectName = defect.getQualityDefectName(); - }); + if (!options1.contains(materialCategories)) { + options1.add(materialCategories); + } + int index1 = options1.indexOf(materialCategories); + if (options2.size() <= index1) { + options2.add(new ArrayList<>()); + } + if (!options2.get(index1).contains(materialSubclass)) { + options2.get(index1).add(materialSubclass); + } + int index2 = options2.get(index1).indexOf(materialSubclass); + if (options3.size() <= index1) { + options3.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); + } + }); + opv.setPicker(options1, options2, options3); + } else { + Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); + } + } + + }); } // 三联添加 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 5891d63..2a71446 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 @@ -36,7 +36,7 @@ public class CheckWorkActivity extends BaseActivity { private CheckWorkAdapter checkWorkAdapter; private CheckRecordVo checkRecordVo; private String checkCode; - + private String type; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -45,6 +45,7 @@ public class CheckWorkActivity extends BaseActivity { list = Arrays.asList(intent.getStringArrayExtra("list")); binding.setList(list); checkCode = intent.getStringExtra("code"); + type = intent.getStringExtra("type"); binding.setCode(checkCode); binding.workListSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override @@ -68,6 +69,7 @@ public class CheckWorkActivity extends BaseActivity { private void selectInventory(String locationCode) { OkGo.post(url + "/wms/pda/storeCheck/selectInventory") .params("locationCode", locationCode) + .params("type", type) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @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 c166cc3..d4c8194 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 @@ -34,19 +34,20 @@ public class StoreCheckActivity extends BaseActivity { private CheckStoreSelectLocationAdapter adapter; private Intent intent; private Long storeId; - +private String type; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_store_check); - String type = "原材料盘点"; + + type = getIntent().getStringExtra("title"); + binding.setTitle(type); initSelectStore(type); binding.storeListSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { StoreInfoVo storeInfoVo = list.get(position); - storeId = storeInfoVo.getId(); selectLocation(type, storeId); } @@ -112,7 +113,6 @@ public class StoreCheckActivity extends BaseActivity { public void storeCheck1(View view){ List collect = locationList.stream().map(WmsBaseLocationVo::getLocationCode).collect(Collectors.toList()); - submitOrder(collect); } public void storeCheck2(View view){ @@ -125,6 +125,7 @@ public class StoreCheckActivity extends BaseActivity { private void submitOrder(List list){ OkGo.post(url + "/wms/pda/storeCheck/submitOrder") .params("storeId",storeId) + .params("type", type) .addUrlParams("location",list) .execute(new MyRecultCall(dialog, this) { @Override @@ -135,6 +136,7 @@ public class StoreCheckActivity extends BaseActivity { WmsInventoryCheck wmsInventoryCheck=gson.fromJson(body.getDataJson(),WmsInventoryCheck.class); String[] array = list.toArray(new String[0]); intent.putExtra("list",array); + intent.putExtra("type",type); intent.putExtra("code",wmsInventoryCheck.getCheckCode()); startActivity(intent); finish(); 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 index 33d4e28..8637af1 100644 --- 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 @@ -1,18 +1,173 @@ package com.example.haiwei_mom.wms.semi; import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.inputmethod.InputMethodManager; +import com.bigkoo.pickerview.builder.OptionsPickerBuilder; +import com.bigkoo.pickerview.listener.OnOptionsSelectListener; import com.bigkoo.pickerview.view.OptionsPickerView; import com.example.haiwei_mom.R; 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.SemiInVo; +import com.example.haiwei_mom.data.SemiOutVo; +import com.example.haiwei_mom.data.WmsHppStorePlaceVo; +import com.example.haiwei_mom.databinding.ActivitySeimMoveBinding; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; -public class SeimMoveActivity extends BaseActivity { - private OptionsPickerView opv; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +public class SeimMoveActivity extends BaseActivity implements OnOptionsSelectListener { + private OptionsPickerView opv; + private List options1List; + private List> options2List; + private SemiOutVo semi; + private ActivitySeimMoveBinding binding; + private String placeId; + + @SuppressLint("ClickableViewAccessibility") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_seim_move); + binding = DataBindingUtil.setContentView(this, R.layout.activity_seim_move); + InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); + // opv=new OptionsPickerView(this); + initRequest(); + binding.semiOutCode.setOnTouchListener((v, event) -> { + + if (event.getAction() == MotionEvent.ACTION_UP) { + // 获取触摸的位置 + int x = (int) event.getX(); + // 获取图标的边界 + int drawableRightWidth = binding.semiOutCode.getCompoundDrawables()[2].getBounds().width(); + int drawableRightStart = (int) (binding.semiOutCode.getWidth() - binding.semiOutCode.getPaddingRight() - drawableRightWidth); + // 判断是否点击了右侧图标 + if (x >= drawableRightStart && x <= (binding.semiOutCode.getWidth() - binding.semiOutCode.getPaddingRight())) { + imm.hideSoftInputFromWindow(Objects.requireNonNull(this.getCurrentFocus()).getWindowToken(), + InputMethodManager.HIDE_NOT_ALWAYS); + selectHppStorageInfo(binding.semiOutCode.getText().toString()); + return true; + } + } + return false; + }); + } + private List list; + private void initRequest() { + opv = new OptionsPickerBuilder(this, this).build(); + options1List = new ArrayList<>(); + options2List = new ArrayList<>(); + OkGo.post(url + "/wms/pda/seimMove/selectStore").execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + + list = gson.fromJson(body.getDataJson(), new TypeToken>() { + }.getType()); + list.forEach(t -> { + String storeName = t.getStoreName(); + String storePlaceCode = t.getStorePlaceCode(); + if (!options1List.contains(storeName)) { + options1List.add(storeName); + } + int i = options1List.indexOf(storeName); + if (options2List.size() <= i) { + options2List.add(new ArrayList<>()); + } + List strings = options2List.get(i); + + strings.add(storePlaceCode); + + }); + opv.setPicker(options1List, options2List); + + } + // myToastUitls.show(body.getMsg()); + } + }); + } + + + public void semiMoveSelect(View view) { + opv.show(); + } + + @Override + public void onOptionsSelect(int options1, int options2, int options3, View v) { + String locationCode = options2List.get(options1).get(options2); + binding.setLocation(locationCode); + // Optional first = list.stream().filter(wmsHppStorePlaceVo -> wmsHppStorePlaceVo.getStorePlaceCode() + // .equals(locationCode)).map(WmsHppStorePlaceVo::getStorePlaceCode).findFirst(); + placeId=locationCode; + // Log.e("TAG", "onOptionsSelect1:" + first.get()); + // for (int i = 0; i < list.size(); i++) { + // WmsHppStorePlaceVo wmsHppStorePlaceVo = list.get(i); + // if (wmsHppStorePlaceVo.getStorePlaceCode().equals(locationCode)){ + // Log.e("TAG", "onOptionsSelect1:" + i); + // } + // } + // + // Log.e("TAG", "onOptionsSelect2:" + (options2+options1-1)); + + } + + @Override + public void getScannerData(String data) { + super.getScannerData(data); + selectHppStorageInfo(data); + } + + private void selectHppStorageInfo(String code) { + OkGo.post(url + "/wms/pda/semi/selectHppStorageInfo").params("code", code).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + semi = gson.fromJson(body.getDataJson(), SemiOutVo.class); + semi.setOutNumber(semi.getStorageNum()); + binding.setData(semi); + return; + } + myToastUitls.show(body.getMsg()); + } + }); + } + + public void semiMoveSubmit(View view) { + + if (semi==null) return; + OkGo.post(url + "/wms/pda/seimMove/submit") + .params("id", semi.getObjId()) + .params("placeId", placeId) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + finish(); + return; + } + myToastUitls.show(body.getMsg()); + } + }); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_feeding_materials.xml b/app/src/main/res/layout/activity_feeding_materials.xml index f7e8129..2e1d971 100644 --- a/app/src/main/res/layout/activity_feeding_materials.xml +++ b/app/src/main/res/layout/activity_feeding_materials.xml @@ -7,6 +7,9 @@ + + + android:layout_height="match_parent" + android:text="@{data.planCode}"/> + android:layout_height="match_parent" + android:text="@{data.materialName}"/> + android:layout_height="match_parent" + android:background="@color/white" + android:layout_margin="5dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/> \ 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 index dd947f3..a90c222 100644 --- a/app/src/main/res/layout/activity_seim_move.xml +++ b/app/src/main/res/layout/activity_seim_move.xml @@ -8,6 +8,9 @@ + + app:title='@{title??"半成品调拨"}' /> + android:background="@drawable/spinner_bg" + android:onClick="semiMoveSelect" + android:text="@{location}" /> @@ -158,7 +163,7 @@ android:layout_width="match_parent" android:layout_height="55dp" android:layout_margin="20dp" - android:onClick="semiInSubmit" + android:onClick="semiMoveSubmit" android:text="提交" /> \ No newline at end of file