新建发货单修复点击第二遍才清空数据&&保存信息添加凭证单号

发货单一览添加凭证单号
改一些barcode.lenght()>=73 变为barcode.substring(0, 4).equals("http")

src/com/jiaju/activity/DeliveryNoteInquiryActivity.java

@@ -248,6 +248,7 @@ public class DeliveryNoteInquiryActivity extends Activity {
 						model.setLicensePlateNumber(jobj1.optString("车牌号"));
 						model.setPostingDate(jobj1.optString("记账日期"));
 						model.setDeliveryDate(jobj1.optString("送货日期"));
+						model.setMBLNR(jobj1.optString("SAP凭证单号"));
 						model.setSynchronizationStatus(jobj1.optString("同步状态"));
 						model.setRevoke(jobj1.optString("撤销状态"));
 						model.setSyncstatusState(String.valueOf(jobj1.optInt("SYNCSTATUSSTATE")));

src/com/jiaju/activity/ExternalPackingBarcodePrintActivity.java

@@ -220,8 +220,8 @@ public class ExternalPackingBarcodePrintActivity extends Activity {
 							barcodePrintInfoList.clear();
 						}
 						barcodeInfoListAdapter.notifyDataSetChanged();
-					}
-					if(barcode.length() >= 73)
+					} 
+					if(barcode.substring(0, 4).equals("http"))
 					{
 						String[] parts = barcode.split("-", 2); // 第二个参数限制分割后的数组长度，这里为2  
 						  
@@ -347,7 +347,7 @@ public class ExternalPackingBarcodePrintActivity extends Activity {
 								}
 								barcodeInfoListAdapter.notifyDataSetChanged();
 							}
-							if(barcode.length() >= 73)
+							if(barcode.substring(0, 4).equals("http"))
 							{
 								String[] parts = barcode.split("-", 2); // 第二个参数限制分割后的数组长度，这里为2  
 								  

src/com/jiaju/activity/PieceActivity.java

@@ -652,8 +652,10 @@ public class PieceActivity extends Activity {
 			@Override
 			public void afterTextChanged(Editable arg0) {
 				if (barcode.getText().toString().contains("\n")) {
-					String etcode = barcode.getText().toString().trim().replaceAll("\\n", "");
-					if (etcode.length() >= 73) {
+					//String etcode = barcode.getText().toString().trim().replaceAll("\\n", "");
+					String etcode = barcode.getText().toString().trim().replaceAll("\\n", "").replaceAll("\n", "");
+					barcode.setText(etcode);
+					if (etcode.substring(0, 4).equals("http")) {
 						String[] parts = etcode.split("-", 2);
 						if (parts.length == 2) {
 							etcode = parts[1];
@@ -661,7 +663,7 @@ public class PieceActivity extends Activity {
 					}
 
 					LogToFile.v("barcode", "addTextChangedListener");
-					if (ispackagpage && (etcode.length() == 8)) { // 在包装页 等于8的是板码
+					if (ispackagpage && (etcode.length() == 8) && !barcode.getText().toString().trim().substring(0, 4).equals("http")) { // 在包装页 等于8的是板码
 						edtBoardCode.setText(etcode);
 						barcode.setText("");
 					} else {
@@ -700,15 +702,15 @@ public class PieceActivity extends Activity {
 			public boolean onEditorAction(TextView arg0, int arg1, KeyEvent arg2) {
 				if (arg1 == EditorInfo.IME_ACTION_GO) {
 					// functionStatus ==0 普通 ==1绑定 ==2验证
-					String etcode = barcode.getText().toString().trim().replaceAll("\\n", "");
-					if (etcode.length() >= 73) {
+					String etcode = barcode.getText().toString().trim().replaceAll("\\n", "").replaceAll("\n", "");
+					if (etcode.substring(0, 4).equals("http")) {
 						String[] parts = etcode.split("-", 2);
 						if (parts.length == 2) {
 							etcode = parts[1];
 						}
 					}
 					LogToFile.v("barcode", "setOnEditorActionListener");
-					if (ispackagpage && (etcode.length() == 8)) { // 在包装页 等于8的是板码
+					if (ispackagpage && (etcode.length() == 8)&& !barcode.getText().toString().trim().substring(0, 4).equals("http")) { // 在包装页 等于8的是板码
 						edtBoardCode.setText(etcode);
 						barcode.setText("");
 					} else {

src/com/jiaju/activity/ProductPathActivity.java

@@ -257,7 +257,7 @@ public class ProductPathActivity extends Activity {
 			}
 		    } });
 		    
-		    if(barcode.length() >= 73)
+		    if(barcode.substring(0, 4).equals("http"))
 			{
 				String[] parts = barcode.split("-", 2); // 第二个参数限制分割后的数组长度，这里为2  
 				  
@@ -327,7 +327,7 @@ public class ProductPathActivity extends Activity {
 			    return source.length() < 1 ? dest.subSequence(dstart, dend) : "";
 			}
 		    } });
-		    if(barcode.length() >= 73)
+		    if(barcode.substring(0, 4).equals("http"))
 			{
 				String[] parts = barcode.split("-", 2); // 第二个参数限制分割后的数组长度，这里为2  
 				  

src/com/jiaju/activity/SendOutGoods.java

@@ -737,6 +737,17 @@ public class SendOutGoods extends Activity {
 				} });
 				CommonUtil.BarcodeMaxLength(barcodeEdt, 50);
 				break;
+			case 1://¹Ø±ÕתȦ
+				ProcessDialogUtils.closeProgressDilog();
+				if (mHandler != null) {
+					mHandler.removeCallbacksAndMessages(null);
+					mHandler.getLooper().quit();
+				}
+
+				Bundle b1 = msg.getData();
+				String message1 = b1.getString("message");
+				CommonUtil.showRepeatDialog(message1, SendOutGoods.this);
+				break;
 			}
 		}
 	};
@@ -1231,13 +1242,15 @@ public class SendOutGoods extends Activity {
 					String message = object.optString("Message");
 					//JSONObject result3 =(JSONObject) object.opt("Result");
 					//JSONArray resArray = (JSONArray)result3.opt("Result");
-					if (status > 0) {
+					if (status == 0) {
 						barcodeList.removeAll(barcodeList);
 						adapter.notifyDataSetChanged();
 						messageLst.getLayoutParams().height=(barcodeList.size()*Height);
 						saveBtn.setText("±£´æ(" + barcodeList.size() + ")");
-						CustomToast.showToast(getApplicationContext(), "³É¹¦", 2000);
-						CommonUtil.playSound(getApplicationContext());
+						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
+						CommonUtil.showSaveAlertDialog(0,message , SendOutGoods.this, null, barcodeEdt, 2);
+//						CustomToast.showToast(getApplicationContext(), "³É¹¦", 2000);
+//						CommonUtil.playSound(getApplicationContext()); 
 						//checkedProcedureList.clear();
 						//procedureTv.setText("");
 						//descEdt.setText("");
@@ -1540,4 +1553,5 @@ public class SendOutGoods extends Activity {
 		}
 		return super.onOptionsItemSelected(item);
 	}
+	 
 }

src/com/jiaju/adapter/DeliveryNoteInquiryItemAdapter.java

@@ -64,6 +64,7 @@ public class DeliveryNoteInquiryItemAdapter extends BaseAdapter{
 			viewHolder.LicensePlateNumberTv = (TextView) convertView.findViewById(R.id.LicensePlateNumber);
 			viewHolder.PostingDateTv = (TextView) convertView.findViewById(R.id.PostingDate);
 			viewHolder.DeliveryDateTv = (TextView) convertView.findViewById(R.id.DeliveryDate);
+			viewHolder.MBLNRTv = (TextView) convertView.findViewById(R.id.MBLNR);
 			viewHolder.SynchronizationStatusTv = (TextView) convertView.findViewById(R.id.SynchronizationStatus);
 			viewHolder.RevokeTv = (TextView) convertView.findViewById(R.id.revoke); 
 			viewHolder.linQINQI = (LinearLayout) convertView.findViewById(R.id.lin_jump);
@@ -81,6 +82,7 @@ public class DeliveryNoteInquiryItemAdapter extends BaseAdapter{
 		viewHolder.PostingDateTv.setText(deliverynoteInquiryitemModel.getPostingDate());
 		viewHolder.DeliveryDateTv.setText(deliverynoteInquiryitemModel.getDeliveryDate());
 		viewHolder.SynchronizationStatusTv.setText(deliverynoteInquiryitemModel.getSynchronizationStatus());
+		viewHolder.MBLNRTv.setText(deliverynoteInquiryitemModel.getMBLNR());
 		viewHolder.RevokeTv.setText(deliverynoteInquiryitemModel.getRevoke()); 
 		viewHolder.backgroundcolor.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -139,6 +141,8 @@ public class DeliveryNoteInquiryItemAdapter extends BaseAdapter{
 		TextView PostingDateTv;
 		/**送货日期*/
 		TextView DeliveryDateTv;
+		/**SAP凭证单号*/
+		TextView MBLNRTv;
 		/**同步状态*/
 		TextView SynchronizationStatusTv;
 		/**撤销状态*/

src/com/jiaju/model/DeliveryNoteInquiryItemModel.java

@@ -31,6 +31,10 @@ public class DeliveryNoteInquiryItemModel {
 	 * */
 	public String DeliveryDate;
 	/**
+	 * SAPƾ֤µ¥ºÅ
+	 * */
+	public String MBLNR;
+	/**
 	 * ͬ²½×´Ì¬
 	 * */
 	public String SynchronizationStatus;
@@ -90,6 +94,12 @@ public class DeliveryNoteInquiryItemModel {
 	public void setDeliveryDate(String deliveryDate) {
 		DeliveryDate = deliveryDate;
 	}
+	public String getMBLNR() {
+		return MBLNR;
+	}
+	public void setMBLNR(String mBLNR) {
+		MBLNR = mBLNR;
+	}
 	public String getSynchronizationStatus() {
 		return SynchronizationStatus;
 	}
@@ -126,14 +136,18 @@ public class DeliveryNoteInquiryItemModel {
 	public void setAmendsState(String amendsState) {
 		AmendsState = amendsState;
 	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
 	@Override
 	public String toString() {
-		return "DeliveryNoteInquiryItemModel [SenddoutgoodsLogID=" + SenddoutgoodsLogID + ", ShippingOrderNumber="
-				+ SendoutCode + ", SendOutWarehouse=" + SendOutWarehouse + ", ReceivingWarehouse="
-				+ ReceivingWarehouse + ", LicensePlateNumber=" + LicensePlateNumber + ", PostingDate=" + PostingDate
-				+ ", DeliveryDate=" + DeliveryDate + ", SynchronizationStatus=" + SynchronizationStatus + ", Revoke="
+		return "DeliveryNoteInquiryItemModel [SenddoutgoodsLogID=" + SenddoutgoodsLogID + ", SendoutCode=" + SendoutCode
+				+ ", SendOutWarehouse=" + SendOutWarehouse + ", ReceivingWarehouse=" + ReceivingWarehouse
+				+ ", LicensePlateNumber=" + LicensePlateNumber + ", PostingDate=" + PostingDate + ", DeliveryDate="
+				+ DeliveryDate + ", MBLNR=" + MBLNR + ", SynchronizationStatus=" + SynchronizationStatus + ", Revoke="
 				+ Revoke + ", CheckBoxFlag=" + CheckBoxFlag + ", SyncstatusState=" + SyncstatusState + ", RevokeState="
 				+ RevokeState + ", AmendsState=" + AmendsState + "]";
 	}
 	 
+	 
 }