|
|
@@ -1,6 +1,5 @@
|
|
|
package com.uas.uas_mes_zb_p.fragment;
|
|
|
|
|
|
-import android.app.Activity;
|
|
|
import android.app.AlertDialog;
|
|
|
import android.content.Context;
|
|
|
import android.content.DialogInterface;
|
|
|
@@ -347,7 +346,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
|
|
|
|
|
|
String ifcancel;
|
|
|
if (add_checkbos.isChecked()==true){
|
|
|
-
|
|
|
ifcancel="true";
|
|
|
}else {
|
|
|
|
|
|
@@ -383,7 +381,9 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
|
|
|
JSONObject dataObject = resultObject.getJSONObject("data");
|
|
|
if (dataObject != null) {
|
|
|
bar_remain = FastjsonUtil.getText(dataObject, "bar_remain");
|
|
|
- initEditPopupWindow();
|
|
|
+ if (!add_checkbos.isChecked()){
|
|
|
+ initEditPopupWindow();
|
|
|
+ }
|
|
|
EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
|
|
|
}
|
|
|
|
|
|
@@ -432,11 +432,16 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
|
|
|
Log.e("numberDouble", numberDouble +"");
|
|
|
double v = pd_barcodeqtyDouble + numberDouble;
|
|
|
Log.e("v",v+"");
|
|
|
- if (pd_barcodeqtyDouble > pd_outqtyDouble||pd_barcodeqtyDouble + numberDouble > pd_outqtyDouble){
|
|
|
+ if (add_checkbos.isChecked()==true){
|
|
|
+ baoucn(data,number);
|
|
|
+ }else {
|
|
|
+ if (pd_barcodeqtyDouble > pd_outqtyDouble||pd_barcodeqtyDouble + numberDouble > pd_outqtyDouble){
|
|
|
dialosDatas(data,number,v, pd_outqtyDouble);
|
|
|
}else {
|
|
|
baoucn(data,number);
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
//保存
|
|
|
@@ -1215,19 +1220,29 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
|
|
|
@Override
|
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
- if (resultCode != Activity.RESULT_OK) {
|
|
|
if (requestCode == SCAN_BARCODE_CODE && data != null) {
|
|
|
if (data.getExtras() != null) {
|
|
|
String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
|
|
|
- if (mFocusId == R.id.storage_recharge_collect_et) {
|
|
|
+ SharedPreUtil.saveString(mActivity,"out_editorcodes",result);
|
|
|
+ if (mFocusId == R.id.storage_recharge_collect_ets) {
|
|
|
storage_recharge_collect_ets.setText(result);
|
|
|
storage_recharge_collect_ets.setSelection(result.length());
|
|
|
+ if (add_checkbos.isChecked()==true){
|
|
|
+ baoucn(result,"");
|
|
|
+ storage_recharge_collect_ets.selectAll();
|
|
|
+ storage_recharge_collect_ets.requestFocus();
|
|
|
+ imm.showSoftInput(storage_recharge_collect_ets, InputMethodManager.RESULT_HIDDEN);
|
|
|
+ }else if (ck_special_outbound.isChecked()==true){
|
|
|
+ getDatalistCodes(result);
|
|
|
+ }else {
|
|
|
+ getDatalistCodes(result);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
- getDatalistCodes(result);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
if (requestCode == Constants.FLAG.GET_COMMON_ITEM && resultCode == 1847) {
|