diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1dfd9b9..e9c7793 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -99,6 +99,12 @@
+
+
+
+
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 d2921b5..354b545 100644
--- a/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java
+++ b/app/src/main/java/com/example/haiwei_mom/HomePageActivity.java
@@ -78,6 +78,7 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
map.put("机台投料", FeedingMaterialsActivity.class);
map.put("工装验证", FeedingMaterialsActivity.class);
map.put("载具绑定", FeedingMaterialsActivity.class);
+ map.put("硫化换模", FeedingMaterialsActivity.class);
map.put("系统配置", ConfigActivity.class);
map.put("班组管理", ClassItemActivity.class);
map.put("故障报修", BxActivity.class);
@@ -136,8 +137,10 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
intent.putExtra("from","2");
}else if (menuName.equals("载具绑定")){
intent.putExtra("from","4");
+ }else if (menuName.equals("硫化换模")){
+ intent.putExtra("from","5");
}else if (menuName.equals("半成品退库")){
- intent.putExtra("from","4");
+ intent.putExtra("from","2");
}
startActivity(intent);
diff --git a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java
index 363052c..354cff4 100644
--- a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java
+++ b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java
@@ -41,9 +41,10 @@ import okhttp3.MediaType;
public class BaseActivity extends AppCompatActivity implements MyScannerCall {
public static final int CAMERA_PHOTO = 1;
- // public static String url = "http://10.11.180.67:6080";
- public static String url = "http://192.168.100.100:6080";//设备
+ // public static String url = "http://10.11.184.221:6080";
+ // public static String url = "http://192.168.100.100:6080";//设备
// public static String url = "http://1.13.177.47:6080";
+ public static String url = "http://192.168.0.104:6080";
public ProgressDialog dialog;
public Gson gson;
public MediaType JSON = MediaType.parse("application/json; charset=utf-8");
@@ -64,6 +65,9 @@ public class BaseActivity extends AppCompatActivity implements MyScannerCall {
myToastUitls=new MyToastUitls(this);
}
+ public static void setUrl(String url) {
+ BaseActivity.url = url;
+ }
private void initDialog() {
dialog = new ProgressDialog(this);
diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java
index 568ebf5..46222e2 100644
--- a/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java
+++ b/app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspection.java
@@ -19,7 +19,7 @@ public class DeviceInspection extends BaseObservable {
* routeName : 测试线路1
*/
- private int inspectInstanceId;
+ private Long inspectInstanceId;
private String billsInspectCode;
private String createTime;
private String inspectType;
@@ -46,11 +46,11 @@ public class DeviceInspection extends BaseObservable {
}
- public int getInspectInstanceId() {
+ public Long getInspectInstanceId() {
return inspectInstanceId;
}
- public void setInspectInstanceId(int inspectInstanceId) {
+ public void setInspectInstanceId(Long inspectInstanceId) {
this.inspectInstanceId = inspectInstanceId;
}
diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java
index 7802502..a395c38 100644
--- a/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java
+++ b/app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java
@@ -33,7 +33,7 @@ public class MaintainBeen {
*/
private String createTime;
- private int maintInstanceId;
+ private Long maintInstanceId;
private int wfProcessId;
private String billsMaintCode;
private String planEndTime;
@@ -58,11 +58,11 @@ public class MaintainBeen {
this.createTime = createTime;
}
- public int getMaintInstanceId() {
+ public Long getMaintInstanceId() {
return maintInstanceId;
}
- public void setMaintInstanceId(int maintInstanceId) {
+ public void setMaintInstanceId(Long maintInstanceId) {
this.maintInstanceId = maintInstanceId;
}
diff --git a/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java
index 398987f..88a3c89 100644
--- a/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java
+++ b/app/src/main/java/com/example/haiwei_mom/wms/semi/BindingActivity.java
@@ -7,8 +7,9 @@ import android.view.View;
import android.widget.Toast;
import com.example.haiwei_mom.R;
+import com.example.haiwei_mom.base.BaseActivity;
-public class BindingActivity extends AppCompatActivity {
+public class BindingActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {