diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f74690..8d34eb2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,9 @@
android:theme="@style/Theme.Jingyuanmes"
android:usesCleartextTraffic="true"
tools:targetApi="31">
+
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 2527db4..ba53790 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
@@ -8,6 +8,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.media.MediaPlayer;
import android.os.Bundle;
+import android.util.Log;
import android.view.View;
import android.view.Window;
@@ -29,11 +30,12 @@ public class BaseActivity extends AppCompatActivity {
public Gson gson;
public MediaType JSON = MediaType.parse("application/json; charset=utf-8");
private MyReceiver myReceiver;
- public String handle = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImYzZDU3MWE5LWVhY2UtNGZlYi05OGIzLWI1YjlmNWI0ZmNlYyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.IXlAZ1Byx_Ou6Szul1vy6AEpgsIMGZ97OAdpZjCbwTLoCwQ6jt2tJmxFtdL-FVl35zrAFqNHMPe-oxr5kaGY8A";
+ public String handle = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjczZTJhYjFjLTc5ZDAtNDg5NS04MzE5LWZlYjdlYjAxZmIzMiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.veofmW5UgF7f2qFVuTKMM0qOIvEbAoQ9V0Etf9xJXWHJmOfkTWxGgPlBibXKk-GXBvWGd-CgSM6ljhRu2Pz9xA";
public Context context;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Log.e("TAG", this.getLocalClassName() );
gson = new Gson();
SharedPreferencesUtils.putstring("access_token",handle);
this.context=this;
diff --git a/app/src/main/java/com/example/jingyuan_mes/base/MyResult.java b/app/src/main/java/com/example/jingyuan_mes/base/MyResult.java
index c8d9571..801aa2e 100644
--- a/app/src/main/java/com/example/jingyuan_mes/base/MyResult.java
+++ b/app/src/main/java/com/example/jingyuan_mes/base/MyResult.java
@@ -9,6 +9,15 @@ public class MyResult {
private String msg;
private Object data;
private Object rows;
+ private int total;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
public Object getRows() {
return rows;
diff --git a/app/src/main/java/com/example/jingyuan_mes/store/ProductOutActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/ProductOutActivity.java
new file mode 100644
index 0000000..38ec6f1
--- /dev/null
+++ b/app/src/main/java/com/example/jingyuan_mes/store/ProductOutActivity.java
@@ -0,0 +1,19 @@
+package com.example.jingyuan_mes.store;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+
+import android.os.Bundle;
+
+import com.example.jingyuan_mes.R;
+import com.example.jingyuan_mes.databinding.ActivityProductOutBinding;
+
+public class ProductOutActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ActivityProductOutBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_product_out);
+ binding.setAdapter();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/jingyuan_mes/store/StockreturnActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/StockreturnActivity.java
index dfaf915..60d9137 100644
--- a/app/src/main/java/com/example/jingyuan_mes/store/StockreturnActivity.java
+++ b/app/src/main/java/com/example/jingyuan_mes/store/StockreturnActivity.java
@@ -46,7 +46,7 @@ public class StockreturnActivity extends BaseActivity implements ItemClickCall,
public void onSuccess(Response response) {
super.onSuccess(response);
var body = response.body();
- if (body.getRows() == null) {
+ if (body.getTotal()==0) {
if (list != null) {
list.clear();
adapter.notifyDataSetChanged();
diff --git a/app/src/main/res/layout/activity_product_out.xml b/app/src/main/res/layout/activity_product_out.xml
new file mode 100644
index 0000000..2ab7998
--- /dev/null
+++ b/app/src/main/res/layout/activity_product_out.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_menu.xml b/app/src/main/res/layout/item_menu.xml
index ecea80f..da71361 100644
--- a/app/src/main/res/layout/item_menu.xml
+++ b/app/src/main/res/layout/item_menu.xml
@@ -10,9 +10,9 @@