Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.ss.mes.pda

src/com/jiaju/activity/SendOutGoods.java

@@ -143,6 +143,7 @@ public class SendOutGoods extends Activity {
 	private SendOutGoodsListMessageAdapter adapter;
 	private boolean isCancel=false;
 	private boolean isFirst=true;
+	private String IsSYNCSTATUS="0";
 	private int Height=188;
 
 	@Override
@@ -161,6 +162,10 @@ public class SendOutGoods extends Activity {
 		initView();
 		sendOutGoodLogId="";
 	    sendOutGoodLogId = this.getIntent().getStringExtra("sendoutCode");
+	    IsSYNCSTATUS = this.getIntent().getStringExtra("SYNCSTATUS");
+	    if(IsSYNCSTATUS==null||IsSYNCSTATUS.equals("")) {
+	    	IsSYNCSTATUS="0";	    	
+	    }
 			if(sendOutGoodLogId==null||sendOutGoodLogId=="")
 			{
 				((LinearLayout) findViewById(R.id.LinearLayout06)).setVisibility(View.GONE);
@@ -228,8 +233,6 @@ public class SendOutGoods extends Activity {
 		mHandler = new Handler(thread.getLooper());
 		ReceiveRunnable ReceiveRunnable = new ReceiveRunnable(obj);
 		mHandler.post(ReceiveRunnable);
-
-		;
 	}
 
 	 //protected void onResume() {
@@ -1423,8 +1426,8 @@ public class SendOutGoods extends Activity {
 								messageLst.setAdapter(adapter);
 							} else {
 								adapter.notifyDataSetChanged();
-								messageLst.getLayoutParams().height=(barcodeList.size()*Height);
 							}
+							messageLst.getLayoutParams().height=(barcodeList.size()*Height);
 
 							saveBtn.setText("±£´æ(" + barcodeList.size() + ")");
 							barcodeEdt.setEnabled(true);
@@ -1442,6 +1445,12 @@ public class SendOutGoods extends Activity {
 									return null;
 								}
 							} });
+							if(IsSYNCSTATUS.equals("1"))
+							{
+								barcodeEdt.setEnabled(false);
+								saveBtn.setEnabled(false);
+								//sendOutSpinner.setSpinnerMode(DialogFragment.MODE_DIALOG);
+							}
 							CommonUtil.BarcodeMaxLength(barcodeEdt, 50);
 							// InputMethodManager im = (InputMethodManager) barcodeEdt
 							// .getContext().getSystemService(