1

bin/classes/.gitignore

@@ -1,2 +1 @@
-/.DS_Store
 /com/

res/layout/activity_partial_check.xml

@@ -156,11 +156,62 @@
        
         </LinearLayout>
     </LinearLayout>
+     <LinearLayout
+        android:id="@+id/llay_staff"
+        android:layout_below="@id/check_scan_area"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="5dp"
+        >
+        
+        <com.jiaju.widget.JustifyTextView 
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:text="员  工"
+            android:textSize="@dimen/textsize_16" 
+            android:textColor="@color/white"
+            android:layout_gravity="center"/>
+           <TextView 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="："
+        android:textColor="@color/white"
+        android:textSize="@dimen/textsize_16"
+          />
+        <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+        <EditText
+            android:id="@+id/edt_staff"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+           android:imeOptions="actionGo"
+            android:background="@null"
+            android:textSize="@dimen/textsize_24" 
+            android:textColor="@color/white"
+            android:singleLine="true"/>
+        
+     
+           <View
+            android:layout_marginRight="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"       
+            android:background="@color/text_gray"/>
+        
+       
+        </LinearLayout>
+    </LinearLayout>
       <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
          android:id="@+id/productLine"
-          android:layout_below="@id/check_scan_area"
+          android:layout_below="@id/llay_staff"
         android:orientation="horizontal"
         >
      <View 
@@ -174,7 +225,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" 
         android:layout_marginTop="4dp"
-        android:layout_below="@id/productLine"
+        android:layout_below="@id/llay_staff"
         android:orientation="vertical">
         
         <LinearLayout

res/layout/activity_semi_check_register.xml

@@ -152,13 +152,63 @@
      
 </LinearLayout>
     </LinearLayout>
+    <LinearLayout 
+         android:id="@+id/llay_staff"
+         android:layout_below="@id/check_scan_area"
+         android:layout_width="fill_parent"
+         android:layout_height="wrap_content"
+         android:orientation="horizontal"
+         android:layout_marginTop="5dp"
+        >
+         <com.jiaju.widget.JustifyTextView
+               android:layout_marginLeft="10dp" 
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:text="员  工"
+            android:textSize="@dimen/textsize_16"
+            android:textColor="@color/white"
+           android:layout_gravity="center"/>
+           <TextView 
+             android:layout_width="wrap_content"
+             android:layout_height="20dp"
+              android:layout_gravity="center"
+              android:text="："
+             android:textColor="@color/white"
+              android:textSize="@dimen/textsize_16"
+          />
+         
+<LinearLayout 
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="10dp"
+    android:orientation="vertical"
+    android:layout_marginLeft="8dp"
+    >
     
+        <EditText
+            android:id="@+id/edt_staff"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:imeOptions="actionGo"
+            android:singleLine="true"
+            android:textColor="@color/white"
+            android:textSize="@dimen/textsize_24" >
+        </EditText>
+    
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dp" 
+            android:background="@color/text_gray"/>
+     
+</LinearLayout>
+    </LinearLayout>
            <LinearLayout
         android:id="@+id/check_goods_area"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" 
         android:layout_marginTop="2dp"
-        android:layout_below="@id/check_scan_area"
+        android:layout_below="@id/llay_staff"
         android:orientation="vertical">
             <View 
             android:layout_width="fill_parent"

res/layout/piece_head_view.xml

@@ -3,6 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@null"
+    android:focusable="false" 
+    android:focusableInTouchMode="false"
     android:orientation="vertical" >
 
     <LinearLayout
@@ -63,18 +65,14 @@
             android:textColor="@color/white"
             android:textSize="@dimen/textsize_16" />
 
-        <EditText
-            android:id="@+id/edt_staff"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="10dp"
-            android:background="@null"
-            android:imeOptions="actionGo"
-            android:maxLength="30"
-            android:singleLine="true"
-            android:text=""
-            android:textColor="@color/white"
-            android:textSize="@dimen/textsize_24" />
+      <TextView  
+    android:id="@+id/edt_staff"  
+    android:layout_width="fill_parent"  
+    android:layout_height="wrap_content"  
+    android:layout_marginRight="10dp"  
+    android:textColor="@color/white"  
+    android:textSize="@dimen/textsize_24" />
+
     </LinearLayout>
 
     <LinearLayout

res/layout/semi_check_collect.xml

@@ -116,12 +116,60 @@
                     android:layout_toRightOf="@id/symbol1"
                     android:background="@color/text_gray" />
             </RelativeLayout>
+<LinearLayout
+                android:id="@+id/llat_staff"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/workno_area"
+                android:layout_marginTop="5.0dip"
+                android:orientation="horizontal" >
+
+                <com.jiaju.widget.JustifyTextView 
+                    android:layout_width="70dip"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dip"
+                    android:text="员  工"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/textsize_16" />
 
+                <TextView 
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dip"
+                    android:layout_gravity="center"
+                    android:text="："
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/textsize_16" />
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dip"
+                    android:layout_marginRight="10dip"
+                    android:orientation="vertical" >
+
+                    <TextView
+                        android:id="@+id/edt_staff"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@null"
+                        android:imeOptions="actionGo"
+                        android:singleLine="true"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/textsize_24" />
+
+                    <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="1dip"
+                        android:background="@color/text_gray" />
+                </LinearLayout>
+            </LinearLayout>
+            
             <LinearLayout
                 android:id="@+id/check_scan_area"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/workno_area"
+                android:layout_below="@id/llat_staff"
                 android:layout_marginTop="5.0dip"
                 android:orientation="horizontal" >
 
@@ -167,7 +215,7 @@
                         android:background="@color/text_gray" />
                 </LinearLayout>
             </LinearLayout>
-
+ 
             <LinearLayout
                 android:id="@+id/check_goods_area"
                 android:layout_width="fill_parent"

res/layout/update_check_collect.xml

@@ -104,12 +104,59 @@
                     android:layout_toRightOf="@id/symbol1"
                     android:background="@color/text_gray" />
             </RelativeLayout>
+         <LinearLayout
+                android:id="@+id/llat_staff"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/workno_area"
+                android:layout_marginTop="5.0dip"
+                android:orientation="horizontal" >
+
+                <com.jiaju.widget.JustifyTextView 
+                    android:layout_width="70dip"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dip"
+                    android:text="员  工"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/textsize_16" />
 
+                <TextView 
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dip"
+                    android:layout_gravity="center"
+                    android:text="："
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/textsize_16" />
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dip"
+                    android:layout_marginRight="10dip"
+                    android:orientation="vertical" >
+
+                    <TextView
+                        android:id="@+id/edt_staff"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@null"
+                        android:imeOptions="actionGo"
+                        android:singleLine="true"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/textsize_24" />
+
+                    <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="1dip"
+                        android:background="@color/text_gray" />
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:id="@+id/check_scan_area"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/workno_area"
+                android:layout_below="@id/llat_staff"
                 android:layout_marginTop="5.0dip"
                 android:orientation="horizontal" >
 
@@ -155,7 +202,8 @@
                         android:background="@color/text_gray" />
                 </LinearLayout>
             </LinearLayout>
-
+         
+            
             <LinearLayout
                 android:id="@+id/check_goods_area"
                 android:layout_width="fill_parent"

src/com/jiaju/activity/CheckCollectModifyActivity.java

@@ -79,7 +79,7 @@ import android.widget.Toast;
 
 public class CheckCollectModifyActivity extends Activity {
     private EditText barcode;
-    private EditText edt_staff;
+    private TextView edt_staff;
     private String accountCode;
     private static String checkCollectModify_userCode;
     private String password;
@@ -216,7 +216,7 @@ public class CheckCollectModifyActivity extends Activity {
     private void initView() {
 	barcode = (EditText) findViewById(R.id.bar_code);
 	barcode.setRawInputType(InputType.TYPE_CLASS_NUMBER); 
-	edt_staff = (EditText) findViewById(R.id.edt_staff);
+	edt_staff = (TextView) findViewById(R.id.edt_staff);
 	footerdivider = findViewById(R.id.footerdivider);
 	repairEdt = (TextView) findViewById(R.id.repairtxt);
 	backBtn = (ImageButton) findViewById(R.id.left_img);
@@ -2135,6 +2135,7 @@ public class CheckCollectModifyActivity extends Activity {
 		    }
 		} });
 		break;
+	   
 	    }
 	}
     };
@@ -3961,8 +3962,8 @@ public class CheckCollectModifyActivity extends Activity {
 						    m.setData(b);
 						    exceptionHandler.sendMessage(m);
 						    return;
-						} else {
-						    Message m1 = new Message();
+						} else   {
+							Message m1 = new Message();
 						    Bundle b1 = new Bundle();
 						    b1.putString("message", outErrMsg30);
 						    b1.putString("flag", missFlag);
@@ -4089,15 +4090,15 @@ public class CheckCollectModifyActivity extends Activity {
 					exceptionHandler.sendMessage(m);
 					return;
 				    } else {
-					Message m1 = new Message();
-					Bundle b1 = new Bundle();
-					b1.putString("errmsg", outErrMsg33);
-					b1.putString("flag", missFlag);
-					m1.what = 6;
-					m1.setData(b1);
-					exceptionHandler.sendMessage(m1);
-					return;
-				    }
+						Message m1 = new Message();
+						Bundle b1 = new Bundle();
+						b1.putString("errmsg", outErrMsg33);
+						b1.putString("flag", missFlag);
+						m1.what = 6;
+						m1.setData(b1);
+						exceptionHandler.sendMessage(m1);
+						return;
+			        }
 
 				}
 			    }

src/com/jiaju/activity/PieceActivity.java

@@ -97,6 +97,8 @@ public class PieceActivity extends Activity {
     private String userCode1 = "";// 生产工号Code
     private String userName1 = "";// 生产工号Name
     private String outErrMsg = "";
+    private String StaffCode = "";
+    private String StaffName  = "";
     // 服务器返回_生产条码检验
     private String out_goodsID = "";// 条码对应的产品ID
     private String out_logoID = "";// 条码对应的产品ID
@@ -187,7 +189,7 @@ public class PieceActivity extends Activity {
     private Spinner pageSpinner; // 版面选择控件
     private Spinner goodsCodeSpinner; // 产品编码选择控件
     private EditText eatOrderNumber;
-    private EditText eatNumber,edt_staff;
+    private TextView eatNumber,edt_staff;
     private EditText check_goods_code_search;
     private boolean isFirst = true;
     private int PACKAGECODE = 17;
@@ -418,7 +420,7 @@ public class PieceActivity extends Activity {
 	llay_order_number = (LinearLayout) head.findViewById(R.id.llay_order_number);
 	view_goods_code_search = (LinearLayout) head.findViewById(R.id.view_goods_code_search);
 	llstaff = (LinearLayout) head.findViewById(R.id.llstaff);
-	edt_staff = (EditText) head.findViewById(R.id.edt_staff);
+	edt_staff = (TextView) head.findViewById(R.id.edt_staff);
 	llay_edt_product_code = (LinearLayout) head.findViewById(R.id.llay_edt_product_code);
 	edt_product_code = (EditText) head.findViewById(R.id.edt_product_code);
 	view_edt_product_code = (LinearLayout) head.findViewById(R.id.view_edt_product_code);
@@ -1201,8 +1203,8 @@ public class PieceActivity extends Activity {
 			String result = jo.optString("Result");
 			JSONObject object = new JSONObject(result);
 			outErrMsg = object.optString("ErrMsg");
-			String StaffCode = object.optString("StaffCode");
-			String StaffName = object.optString("StaffName");
+			  StaffCode = object.optString("StaffCode");
+			  StaffName = object.optString("StaffName");
 			if(proId==10||proId ==37) { //10施釉人工  37施釉单厨
 				edt_staff.setText(StaffCode);
 			}else {
@@ -1352,15 +1354,15 @@ public class PieceActivity extends Activity {
 				LogToFile.v("!userCodeIsValid", " return");
 				return;
 			    }
-			    barcode.setEnabled(false);
-			    barcode.setFocusable(false);
-			    barcode.setFilters(new InputFilter[] { new InputFilter() {
-				@Override
-				public CharSequence filter(CharSequence source, int start, int end, Spanned dest,
-					int dstart, int dend) {
-				    return source.length() < 1 ? dest.subSequence(dstart, dend) : "";
-				}
-			    } });
+//			    barcode.setEnabled(false);
+//			    barcode.setFocusable(false);
+//			    barcode.setFilters(new InputFilter[] { new InputFilter() {
+//				@Override
+//				public CharSequence filter(CharSequence source, int start, int end, Spanned dest,
+//					int dstart, int dend) {
+//				    return source.length() < 1 ? dest.subSequence(dstart, dend) : "";
+//				}
+//			    } });
 			    if (collectType == 2) {
 				if (piecelist != null && piecelist.size() > 0) {
 				    piecelist.removeAll(piecelist);
@@ -1711,6 +1713,7 @@ public class PieceActivity extends Activity {
 
 			met.setEnabled(true);
 			met.setText("");
+			edt_staff.setText("");
 			met.setFocusable(true);
 			met.setFocusableInTouchMode(true);
 			met.requestFocus();
@@ -1807,7 +1810,8 @@ public class PieceActivity extends Activity {
 		CommonUtil.setDefault(Notification.DEFAULT_VIBRATE,
 
 			getApplicationContext());
-		CommonUtil.showAlertDialog(status2, message2, PieceActivity.this);
+//		CommonUtil.showAlertDialog(status2, message2, PieceActivity.this); 
+		Toast.makeText(PieceActivity.this, message2, 3000).show();
 		if (collectType == 1) {
 		    CommonUtil.playAlertSound(PieceActivity.this);
 		}
@@ -1951,8 +1955,7 @@ public class PieceActivity extends Activity {
 			produceCodeIsValid = false;
 			JSONArray jsonArray2 = new JSONArray(result);
 			JSONObject object2 = (JSONObject) jsonArray2.get(0);
-			String outErrMsg = object2.getString("out_errMsg");
-			edt_staff.setText("");
+			String outErrMsg = object2.getString("out_errMsg"); 
 			if (TextUtils.isEmpty(outErrMsg)) {
 			    if (proId == PACKAGECODE) { // 包装页面 生产工号是默认带出来的 确定之后 焦点回落逻辑
 				userCodeIsValid = true;
@@ -2034,6 +2037,7 @@ public class PieceActivity extends Activity {
 				} else {
 				    met.setEnabled(true);
 				    met.setText("");
+				    edt_staff.setText("");
 				    met.setFocusable(true);
 				    met.setFocusableInTouchMode(true);
 				    met.requestFocus();
@@ -2549,7 +2553,7 @@ public class PieceActivity extends Activity {
 			eatOrderNumber.setText("");
 			edt_product_code.setText("");
 			eatNumber.setText("");
-			edt_staff.setText("");
+			
 			adapterCustomer = new ProductClassifyAdapter(nullList, PieceActivity.this);
 			customerSpinner.setAdapter(adapterCustomer);
 			adapterPage = new ProductClassifyAdapter(nullList, PieceActivity.this);
@@ -4220,6 +4224,7 @@ public class PieceActivity extends Activity {
 		    } else {// 不成功 把生产条码清空 并提示不成功信息 并重新给到焦点
 			CustomToast.showToast(getApplicationContext(), metresult, 2000);
 			met.setText("");
+			edt_staff.setText("");
 			met.setFocusable(true);// 获得焦点
 			met.setFocusableInTouchMode(true);// 获得焦点
 			met.requestFocus();
@@ -5023,8 +5028,8 @@ public class PieceActivity extends Activity {
 		jsonObject.put("userPassword", userPassword);
 		jsonObject.put("sessionKey", sessionKey);
 		jsonObject.put("logoid",
-			check_glazed_trademarkInfo == null ? "" : check_glazed_trademarkInfo.getDefectId()); // 商标
-		jsonObject.put("glazetypeid", check_glaze_colorInfo == null ? "" : check_glaze_colorInfo.getDefectId()); // 釉色
+			check_glazed_trademarkInfo == null ? 0 : check_glazed_trademarkInfo.getDefectId()); // 商标
+		jsonObject.put("glazetypeid", check_glaze_colorInfo == null ? 0 : check_glaze_colorInfo.getDefectId()); // 釉色
 		JSONArray productionDataEntitys = new JSONArray();
 		for (Piece p : piecelist) {
 		    JSONObject obj = new JSONObject();
@@ -5040,7 +5045,7 @@ public class PieceActivity extends Activity {
 		}
 		jsonObject.put("productionDataEntitys", productionDataEntitys);
 		client = new WebClient();
-		String result = client.doPost(
+ 		String result = client.doPost(
 			"http://" + ServerAddress_ip + ":" + ServerAddress_duankou
 				+ "/DKService/PDAModuleService/SaveBarCodeLogoAndGlazetypeWhile",
 			jsonObject.toString(), "application/json");

src/com/jiaju/activity/SemiCheckModifyActivity.java

@@ -174,7 +174,7 @@ public class SemiCheckModifyActivity extends Activity {
     private List<ProductDefectInfo> productBugList = new ArrayList<ProductDefectInfo>();
     private boolean first = true;
     private String procedureName;
-   private EditText edt_staff;
+   private TextView edt_staff;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
@@ -218,7 +218,7 @@ public class SemiCheckModifyActivity extends Activity {
 
     private void initView() {
 	barcode = (EditText) findViewById(R.id.bar_code);
-	edt_staff = (EditText) findViewById(R.id.edt_staff);
+	edt_staff = (TextView) findViewById(R.id.edt_staff);
 	barcode.setRawInputType(InputType.TYPE_CLASS_NUMBER);
 	footerdivider = findViewById(R.id.footerdivider);
 	repairEdt = (TextView) findViewById(R.id.repairtxt);