李士越 1 vuosi sitten
vanhempi
commit
6e694016ed

+ 112 - 91
src/com/jiaju/activity/DeliveryNoteInquiryActivity.java

@@ -128,9 +128,7 @@ public class DeliveryNoteInquiryActivity extends Activity {
 	    tvTitle = (TextView) findViewById(R.id.title);
 		backbtn = (ImageButton) findViewById(R.id.left_img);
 		backtext = (TextView) findViewById(R.id.back); 
-		lstView = (CustomListView) findViewById(R.id.Invoice_listview);
-//		adapter = new DeliveryNoteInquiryItemAdapter(DeliveryNoteInquiryActivity.this, detailList);
-//		lstView.setAdapter(adapter);
+		lstView = (CustomListView) findViewById(R.id.Invoice_listview); 
 		spinnerSynchronizationStatus = (Spinner) findViewById(R.id.SynchronizationStatus_batchSp);
 		revoke = (Spinner) findViewById(R.id.revoke_batchSp);
 		LicensePlateNumber = (Spinner) findViewById(R.id.LicensePlateNumber_batchSp);
@@ -196,82 +194,7 @@ public class DeliveryNoteInquiryActivity extends Activity {
 		orderspinnerAdapter = new OrderSpinnerAdapter(DeliveryNoteInquiryActivity.this, orderList);
 		revoke.setAdapter(orderspinnerAdapter);
 	}
-
-	/**创建线程*/ 
-	Handler handler = new Handler() {
-		@Override
-		public void handleMessage(Message msg) {
-
-			switch (msg.what) {
-			// 车牌号
-			case 0:
-				List<Order> orderList0 = new ArrayList<Order>();
-				Order order0 = new Order();
-				order0.setOrderId(0);
-				order0.setOrderNo("请选择");
-				orderList0.add(order0);
-				Bundle b0 = msg.getData();
-				String result0 = b0.getString("result");
-				ObjectAssignment(result0, orderList0);
-				LicensePlateNumber.setAdapter(orderspinnerAdapter);
-				break;
-			// 发出仓库
-			case 1:
-				List<Order> orderList1 = new ArrayList<Order>();
-				Order order1 = new Order();
-				order1.setOrderId(0);
-				order1.setOrderNo("请选择");
-				orderList1.add(order1);
-				Bundle b1 = msg.getData();
-				String result1 = b1.getString("result");
-				ObjectAssignment(result1, orderList1);
-				SendOutWarehouse.setAdapter(orderspinnerAdapter);
-				break;
-			//接收仓库
-			case 2:
-				List<Order> orderList2 = new ArrayList<Order>();
-				Order order2 = new Order();
-				order2.setOrderId(0);
-				order2.setOrderNo("请选择");
-				orderList2.add(order2);
-				Bundle b2 = msg.getData();
-				String result2 = b2.getString("result");
-				ObjectAssignment(result2, orderList2);
-				ReceivingWarehouse.setAdapter(orderspinnerAdapter);
-				break;
-			// 发货单信息
-			case 3:
-				Bundle b3 = msg.getData();
-				String result3 = b3.getString("result");
-				detailList = ListObjectAssignment(result3);
-				adapter = new DeliveryNoteInquiryItemAdapter(DeliveryNoteInquiryActivity.this, detailList);
-				lstView.setAdapter(adapter);
-				break;
-			// 删除 撤销
-			case 4:
-				try {
-					Bundle b4 = msg.getData();
-					String result4 = b4.getString("result");
-					JSONObject jo = new JSONObject(result4);
-					JSONObject jobj = jo.optJSONObject("d");
-					int status = jobj.optInt("Status");
-					String message = jobj.optString("Message");
-					Message m = new Message();
-					m.what = 0;
-					Bundle b = new Bundle();
-					b.putString("message", message);
-					m.setData(b);
-					exceptionHandler.sendMessage(m); 
-					//重新查询发货单信息
-					QueryInformation();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-				break;
-			}
-		}
-	};
-
+ 
 	/** 对象赋值 */
 	public void ObjectAssignment(String result, List<Order> orderList) {
 		try {
@@ -400,23 +323,26 @@ public class DeliveryNoteInquiryActivity extends Activity {
 
 	/** 控件初始化逻辑 */
 	private void AllListeners() { 
+		// 获取当前时间
+        Date currentDate = new Date();
+        // 定义日期格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //记账日期赋值为当前日期
+		PostingDate_TextView.setText(sdf.format(currentDate));
+		
 		//返回事件
-		backbtn.setOnClickListener(new View.OnClickListener() {
-
+		backbtn.setOnClickListener(new View.OnClickListener() { 
 			@Override
 			public void onClick(View v) {
-				finish();
-
+				finish(); 
 			}
 		});
 		
 		//返回事件
-		backtext.setOnClickListener(new View.OnClickListener() {
-
+		backtext.setOnClickListener(new View.OnClickListener() { 
 			@Override
 			public void onClick(View v) {
-				finish();
-
+				finish(); 
 			}
 		});
 		
@@ -431,8 +357,7 @@ public class DeliveryNoteInquiryActivity extends Activity {
 		});
 
 		// 送货日期点击事件
-		DeliveryDateWorker.setOnClickListener(new View.OnClickListener() {
-
+		DeliveryDateWorker.setOnClickListener(new View.OnClickListener() { 
 			@Override
 			public void onClick(View v) {
 				isDeliveryDateSelected = true;
@@ -546,7 +471,7 @@ public class DeliveryNoteInquiryActivity extends Activity {
 					thread = new HandlerThread("barcodeThread", 5);
 					thread.start();
 					mHandler = new Handler(thread.getLooper());
-					ButtonAPIRunnable Data = new ButtonAPIRunnable(js, API, 4);
+					ButtonAPIRunnable Data = new ButtonAPIRunnable(js, API, 5);
 					mHandler.post(Data);
 				} catch (Exception e) {
 					Message m = new Message();
@@ -614,7 +539,103 @@ public class DeliveryNoteInquiryActivity extends Activity {
 				}
 			}
 		});
-	}
+	 }
+	
+	/**创建线程*/ 
+	Handler handler = new Handler() {
+		@Override
+		public void handleMessage(Message msg) {
+
+			switch (msg.what) {
+			// 车牌号
+			case 0:
+				List<Order> orderList0 = new ArrayList<Order>();
+				Order order0 = new Order();
+				order0.setOrderId(0);
+				order0.setOrderNo("请选择");
+				orderList0.add(order0);
+				Bundle b0 = msg.getData();
+				String result0 = b0.getString("result");
+				ObjectAssignment(result0, orderList0);
+				LicensePlateNumber.setAdapter(orderspinnerAdapter);
+				break;
+			// 发出仓库
+			case 1:
+				List<Order> orderList1 = new ArrayList<Order>();
+				Order order1 = new Order();
+				order1.setOrderId(0);
+				order1.setOrderNo("请选择");
+				orderList1.add(order1);
+				Bundle b1 = msg.getData();
+				String result1 = b1.getString("result");
+				ObjectAssignment(result1, orderList1);
+				SendOutWarehouse.setAdapter(orderspinnerAdapter);
+				break;
+			//接收仓库
+			case 2:
+				List<Order> orderList2 = new ArrayList<Order>();
+				Order order2 = new Order();
+				order2.setOrderId(0);
+				order2.setOrderNo("请选择");
+				orderList2.add(order2);
+				Bundle b2 = msg.getData();
+				String result2 = b2.getString("result");
+				ObjectAssignment(result2, orderList2);
+				ReceivingWarehouse.setAdapter(orderspinnerAdapter);
+				break;
+			// 发货单信息
+			case 3:
+				Bundle b3 = msg.getData();
+				String result3 = b3.getString("result");
+				detailList = ListObjectAssignment(result3);
+				adapter = new DeliveryNoteInquiryItemAdapter(DeliveryNoteInquiryActivity.this, detailList);
+				lstView.setAdapter(adapter);
+				break;
+			// 删除 撤销
+			case 4:
+				try {
+					Bundle b4 = msg.getData();
+					String result4 = b4.getString("result");
+					JSONObject jo = new JSONObject(result4);
+					JSONObject jobj = jo.optJSONObject("d");
+					int status = jobj.optInt("Status");
+					String message = jobj.optString("Message");
+					Message m = new Message();
+					m.what = 0;
+					Bundle b = new Bundle();
+					b.putString("message", message);
+					m.setData(b);
+					exceptionHandler.sendMessage(m); 
+					//重新查询发货单信息
+					QueryInformation();
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				break;
+				// 补推
+				case 5:
+					try {
+						Bundle b5 = msg.getData();
+						String result5 = b5.getString("result");
+						JSONObject jo = new JSONObject(result5);
+						JSONObject jobj = jo.optJSONObject("d");
+						int status = jobj.optInt("Status");
+						String message = jobj.optString("Message");
+						Message m = new Message();
+						m.what = 0;
+						Bundle b = new Bundle();
+						b.putString("message", message);
+						m.setData(b);
+						exceptionHandler.sendMessage(m); 
+						//重新查询发货单信息
+						QueryInformation();
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+					break;
+			}
+		}
+	};
 
 	/** 过滤多选框选中 */
 	public List<DeliveryNoteInquiryItemModel> steamfilter() {

+ 136 - 1
src/com/jiaju/activity/UnloadKilnCarActivity.java

@@ -43,6 +43,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
 
 public class UnloadKilnCarActivity extends Activity {
 	private Button btnAck;// 确定按钮
@@ -702,6 +703,9 @@ public class UnloadKilnCarActivity extends Activity {
 						h1.postDelayed(KilnCodeUpperCase, 300);
 					}
 				}
+				
+				
+				
 
 			}
 
@@ -714,7 +718,21 @@ public class UnloadKilnCarActivity extends Activity {
 
 			@Override
 			public void afterTextChanged(Editable s) {
-
+				
+		
+				if (kilnEdt.getText().toString().contains("\n")) {
+					  kilncode1 = kilnEdt.getText().toString()
+							.trim().replaceAll("\\n", ""); 
+					  if (!TextUtils.isEmpty(kilncode1)) {
+							thread = null;
+							thread = new HandlerThread("kilncarnoThread", 5);
+							thread.start();
+							mHandler = null;
+							mHandler = new Handler(thread.getLooper());
+							mHandler.post(kilnIsbnRunnable);
+						}
+					
+					}
 			}
 		});
 
@@ -874,6 +892,123 @@ public class UnloadKilnCarActivity extends Activity {
 			}
 		});
 
+	
+		etKilnCarCode.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before,
+					int count) {
+			 
+				 
+			}
+
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count,
+					int after) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+				
+		
+				if (etKilnCarCode.getText().toString().contains("\n")) {
+				  String etKilnCar_ = etKilnCarCode.getText().toString()
+							.trim().replaceAll(" ", "").replaceAll("\\n", ""); 
+					  if (!TextUtils.isEmpty(etKilnCar_)) {
+
+							String workno = tvUserCode.getText().toString();
+							if (TextUtils.isEmpty(workno)) {
+								// Toast.makeText(getApplicationContext(), "请先输入生产工号",
+								// Toast.LENGTH_SHORT).show();
+								CustomToast.showToast(getApplicationContext(),
+										"请先输入生产工号", 2000);
+								tvUserCode.setEnabled(true);
+								tvUserCode.setFocusable(true);
+								tvUserCode.setFocusableInTouchMode(true);
+								tvUserCode.requestFocus();
+								tvUserCode.findFocus();
+								tvUserCode
+										.setFilters(new InputFilter[] { new InputFilter() {
+											@Override
+											public CharSequence filter(
+													CharSequence source, int start,
+													int end, Spanned dest, int dstart,
+													int dend) {
+
+												return null;
+											}
+										} });
+								return ;
+							} else {
+								if (!worknovalid) {
+									CustomToast.showToast(getApplicationContext(),
+											"请先验证生产工号", 2000);
+									tvUserCode.setEnabled(true);
+									tvUserCode.setFocusable(true);
+									tvUserCode.setFocusableInTouchMode(true);
+									tvUserCode.requestFocus();
+									tvUserCode.findFocus();
+									tvUserCode
+											.setFilters(new InputFilter[] { new InputFilter() {
+												@Override
+												public CharSequence filter(
+														CharSequence source, int start,
+														int end, Spanned dest,
+														int dstart, int dend) {
+
+													return null;
+												}
+											} });
+									return ;
+								}
+							}
+							kilncode1 = kilnEdt.getText().toString().trim();
+							if (TextUtils.isEmpty(kilncode1)) {
+								CustomToast.showToast(getApplicationContext(),
+										"窑炉车号不能为空", 2000);
+								kilnEdt.setFocusable(true);
+								kilnEdt.requestFocus();
+								return ;
+							}
+							kilnCarCode = etKilnCarCode.getText().toString().replaceAll(" ", "").trim();
+							if (TextUtils.isEmpty(kilnCarCode)) {
+								CustomToast.showToast(getApplicationContext(),
+										"窑炉车号不能为空", 2000);
+								etKilnCarCode.setFocusable(true);
+								etKilnCarCode.requestFocus();
+								return ;
+							}
+
+							if (list != null && list.size() > 0) {
+								list.removeAll(list);
+								if (adapter != null) {
+									adapter.notifyDataSetChanged();
+								}
+							
+								btnSave.setText("保存(" + list.size() + ")");
+
+							}
+							ProcessDialogUtils
+									.showProcessDialog(UnloadKilnCarActivity.this);
+							if(kilnCarCode.length()>3)
+							{
+								kilnCarCode=kilnCarCode.substring(kilnCarCode.length()-3,kilnCarCode.length());
+							}
+							kilnCarCode = kilncode1 + kilnCarCode;
+							thread = null;
+							thread = new HandlerThread("kincarNoThread", 5);
+							thread.start();
+							mHandler = null;
+							mHandler = new Handler(thread.getLooper());
+							mHandler.post(kincarNoRunnable);
+						
+						}
+					
+					}
+			}
+		});
+
 		
 		etKilnCarCode.setOnEditorActionListener(new OnEditorActionListener() {