diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1551392..a38f71c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,8 +34,7 @@ tools:targetApi="31"> - + android:exported="true"> @@ -137,10 +136,10 @@ - - - - + + + + - - - - - + + + + diff --git a/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java b/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java index a9dfc15..9f5b19e 100644 --- a/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java @@ -43,8 +43,8 @@ import okhttp3.MediaType; public class BaseActivity extends AppCompatActivity { public static final int CAMERA_PHOTO = 1; - public static String url = "http://175.27.215.92:7018/prod-api"; - // public static String url = "http://10.11.40.120:7018/dev-api"; + // public static String url = "http://175.27.215.92:7018/prod-api"; + public static String url = "http://10.11.40.120:7018/dev-api"; 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/jingyuan_mes/check/CheckActivity.java b/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java index c6bd71a..ca87dd7 100644 --- a/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java @@ -21,6 +21,7 @@ import com.example.jingyuan_mes.uitls.SharedPreferencesUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.model.Response; +import java.util.ArrayList; import java.util.List; import okhttp3.RequestBody; @@ -38,35 +39,37 @@ public class CheckActivity extends BaseActivity { binding.setAdapter(adapter); var intent = getIntent(); var id = intent.getStringExtra("id"); - if (id!=null){ + if (id != null) { var visble = intent.getBooleanExtra("visble", true); binding.checkSearchLinear.setVisibility(View.GONE); Log.e("TAG", "传值:" + visble); - searchRequest(null,id, visble); + searchRequest(null, id, visble); } } public void checkSubmit(View view) { - OkGo.post(url+"/qms/mobile/saveCheckResultDetail") + OkGo.post(url + "/qms/mobile/saveCheckResultDetail") .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) - .upRequestBody(RequestBody.create(JSON,gson.toJson(checkResult))) - .execute(new MyRecultCall(dialog,this){ + .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){ + if (body.getCode() == 200) { finish(); } Toast.makeText(context, body.getMsg(), Toast.LENGTH_SHORT).show(); } }); } + public void checkSearch(View view) { var serchText = binding.checkSearchText.getText().toString(); - searchRequest(serchText,null,true); + searchRequest(serchText, null, true); } - private void searchRequest(String serchText,String id,boolean status){ + + private void searchRequest(String serchText, String id, boolean status) { OkGo.get(url + "/qms/mobile/getCheckResultDetail") .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) .params("materialBarcode", serchText) @@ -81,13 +84,25 @@ public class CheckActivity extends BaseActivity { checkResult = gson.fromJson(body.getData().toString(), CheckResult.class); checkResult.setVisbleStatus(status); binding.setVm(checkResult); - var qmsCheckResultDetailProjectList = checkResult.getQmsCheckResultDetailProjectList(); - if (qmsCheckResultDetailProjectList==null || qmsCheckResultDetailProjectList.isEmpty()) return; + List qmsCheckResultDetailProjectList; + + qmsCheckResultDetailProjectList = checkResult.getQmsCheckResultDetailProjectList(); + if (qmsCheckResultDetailProjectList == null || qmsCheckResultDetailProjectList.isEmpty()) { + qmsCheckResultDetailProjectList = new ArrayList<>(); + var qmsCheckRuleProjectList = checkResult.getQmsCheckRuleProjectList(); + qmsCheckResultDetailProjectList.addAll(qmsCheckRuleProjectList); + } + adapter.setList(qmsCheckResultDetailProjectList); adapter.notifyDataSetChanged(); - return; + + } else { + binding.setVm(null); + adapter.setList(null); + adapter.notifyDataSetChanged(); + Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); } - Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); + } }); } diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java index 92533ce..e3f2987 100644 --- a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java +++ b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResult.java @@ -77,6 +77,16 @@ public class CheckResult extends BaseObservable { } private List qmsCheckResultDetailProjectList; + private List qmsCheckRuleProjectList; + + public List getQmsCheckRuleProjectList() { + return qmsCheckRuleProjectList; + } + + public void setQmsCheckRuleProjectList(List qmsCheckRuleProjectList) { + this.qmsCheckRuleProjectList = qmsCheckRuleProjectList; + } + /** * 批次号 */ @@ -183,6 +193,7 @@ public class CheckResult extends BaseObservable { } public String getCheckStatus() { + if (checkStatus==null) return ""; switch (checkStatus) { case "0": setCheckStatus("待检验"); diff --git a/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java index 2fdbb60..7776916 100644 --- a/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java @@ -42,9 +42,10 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter private InventoryLocationAdapter adapter; private List list; private Map map; - private int pageNum=1; + private int pageNum = 1; private int warehouseId; - private Intent intent; + private Intent intent; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -61,13 +62,13 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter lpw.setOnItemClickListener(this); var intent = getIntent(); var inventoryCheckId = intent.getIntExtra("inventoryCheckId", -1); - map.put("inventoryCheckId", inventoryCheckId==-1?null:inventoryCheckId); + map.put("inventoryCheckId", inventoryCheckId == -1 ? null : inventoryCheckId); warehouseId = intent.getIntExtra("warehouseId", 0); if (warehouseId == 0) { initRequest(); } else { var warehouseName = intent.getStringExtra("warehouseName"); - createLocation(warehouseId,warehouseName); + createLocation(warehouseId, warehouseName); } } @@ -101,19 +102,20 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter var warehouseBeen = warehouseBeenList.get(position); warehouseId = warehouseBeen.getWarehouseId(); lpw.dismiss(); - pageNum=1; - createLocation(warehouseId, warehouseBeen.getWarehouseName()); + pageNum = 1; + createLocation(warehouseId, warehouseBeen.getWarehouseName()); } + // 请求库位 - private void createLocation(int warehouseId,String warehouseName) { + private void createLocation(int warehouseId, String warehouseName) { binding.inventoryCreateHouse.setText(warehouseName); map.put("warehouseId", warehouseId); OkGo.get(url + "/wms/mobile/getLocations").tag(this) .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) .params("warehouseId", warehouseId) - .params("pageNum",pageNum) - .params("pagesize",10) + .params("pageNum", pageNum) + .params("pagesize", 10) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override @@ -135,6 +137,7 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter public void inventorySelectHouse(View view) { lpw.show(); } + // 创建任务 提交 public void inventoryCreateSubmit(View view) { List submitList = new ArrayList<>(); @@ -155,7 +158,7 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter var body = response.body(); if (body.getCode() == 200) { - intent.putExtra("inventoryCheckId",(int)Double.parseDouble(body.getData().toString())); + intent.putExtra("inventoryCheckId", (int) Double.parseDouble(body.getData().toString())); // intent.putExtra("checkStatus",); startActivity(intent); finish(); @@ -169,6 +172,6 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter public void onLoadMore(@NonNull RefreshLayout refreshLayout) { pageNum++; // createLocation(); - Log.e("TAG", "onLoadMore" ); + Log.e("TAG", "onLoadMore"); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/jingyuan_mes/store/InventoryWorkActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/InventoryWorkActivity.java index 1b6d1e6..26eefe9 100644 --- a/app/src/main/java/com/example/jingyuan_mes/store/InventoryWorkActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/store/InventoryWorkActivity.java @@ -103,13 +103,16 @@ public class InventoryWorkActivity extends BaseActivity implements TabLayout.OnT public void onClick(int position) { var inventoryWorkBeen = list.get(position); OkGo.post(url + "/wms/mobile/confirmInventoryCheckDetail").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")).upRequestBody(RequestBody.create(JSON, gson.toJson(inventoryWorkBeen))).execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") @Override public void onSuccess(Response response) { super.onSuccess(response); var body = response.body(); - // if (body.getCode() == 200) { - // - // } + if (body.getCode() == 200) { + var inventoryTime = inventoryWorkBeen.getInventoryTime(); + inventoryWorkBeen.setInventoryTime(inventoryTime++); + adapter.notifyDataSetChanged(); + } Toast.makeText(context, body.getMsg(), Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/res/layout/activity_inventory_task_create.xml b/app/src/main/res/layout/activity_inventory_task_create.xml index db8f3e8..d5471bd 100644 --- a/app/src/main/res/layout/activity_inventory_task_create.xml +++ b/app/src/main/res/layout/activity_inventory_task_create.xml @@ -63,14 +63,14 @@ app:srlEnableRefresh="false" > - + + - + android:layout_height="100dp" + android:layout_marginTop="50dp" + android:src="@drawable/logo"/> - + android:textSize="22sp" /> - + + + android:layout_height="match_parent" + android:text="@={user.username}" /> - + - + - + android:layout_height="match_parent" + android:inputType="textPassword" + android:layout_gravity="center" + android:imeOptions="actionDone" + android:text="@={user.password}" /> - + - - - + -