|
|
@@ -515,6 +515,12 @@ public class MainActivity extends BaseActivity {
|
|
|
popupWindow.dismiss();
|
|
|
});
|
|
|
ok.setOnClickListener(view->{
|
|
|
+ if(sendMsg[2].equals("0")){
|
|
|
+ sendMsg[2] = "";
|
|
|
+ }
|
|
|
+ if(sendMsg[3].equals("0")){
|
|
|
+ sendMsg[3] = "";
|
|
|
+ }
|
|
|
if(!StringUtils.isEmpty(sendMsg[2])&&!StringUtils.isEmpty(sendMsg[3])){
|
|
|
sendMsg[0]="DA2BX";
|
|
|
}
|
|
|
@@ -524,6 +530,10 @@ public class MainActivity extends BaseActivity {
|
|
|
else if(!StringUtils.isEmpty(sendMsg[3])){
|
|
|
sendMsg[0]="DA2B";
|
|
|
}
|
|
|
+ if(StringUtils.isEmpty(sendMsg[2]) && StringUtils.isEmpty(sendMsg[3])){
|
|
|
+ ToastUtils.showToast(context, "货架位置和目的地不能同时为空");
|
|
|
+ return;
|
|
|
+ }
|
|
|
pushTask();
|
|
|
});
|
|
|
|