Browse Source

增加 撤销单品

姜永辉 3 months ago
parent
commit
29f8481406

+ 10 - 1
src/com/jiaju/activity/HomeActivity.java

@@ -820,7 +820,16 @@ public class HomeActivity extends Activity {
 								pm22.setProcedureId(103);
 								LCBZList.add(pm22);
 							}
-						
+							else if (functionCode.equals("063403")) // 쭙능슥쌈-낮饋데틔
+							{
+								ProcedureModel pm22 = new ProcedureModel();
+								pm22.setProcedureMenuCode(functionCode);
+								pm22.setProcedureMenuName("낮饋데틔");
+								pm22.setProcedureModel("00" + 104);
+								pm22.setModelType(103);
+								pm22.setProcedureId(103);
+								LCBZList.add(pm22);
+							}
 							else {
 								ProductLineModel pm1 = new ProductLineModel();
 								pm1.setProductLineMenuCode(functionCode);

+ 9 - 2
src/com/jiaju/activity/LuociRevokeActivity.java

@@ -40,7 +40,7 @@ import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-//裸辞交接 撤销
+//裸辞交接 撤销  和 撤销单品 
 public class LuociRevokeActivity extends Activity {
 	private TextView title;
 	private EditText barcodeEdt;
@@ -64,6 +64,7 @@ public class LuociRevokeActivity extends Activity {
 	private String procedureName;
 	private Handler barcodeUpperH = new Handler();
 	private String barcodeUpper;
+	private String procedureMenuCode; // 撤销单品传过来的值
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -79,6 +80,7 @@ public class LuociRevokeActivity extends Activity {
 		sessionkey = preferences.getString("SessionKey", "");
 		Bundle b = getIntent().getExtras();
 		procedureName = b.getString("title");
+		procedureMenuCode = b.getString("procedureMenuCode");
 		title.setText(procedureName);
 		CommonUtil.BarcodeMaxLength(barcodeEdt, 50);
 		barcodeList = new ArrayList<BarcodeInfo>();
@@ -590,7 +592,12 @@ public class LuociRevokeActivity extends Activity {
 					js.put("userPassword", password);
 					js.put("sessionKey", sessionkey);
 					js.put("module", "LCFinishedProduct");
-					js.put("action", "LCBackFinishedHandoverCheck");
+					// 撤销单品 251210
+					if ("063403".equals(procedureMenuCode)) {
+						js.put("action", "LCBackFinishedHandoverSingleCheck");
+					}else {
+						js.put("action", "LCBackFinishedHandoverCheck");
+					}					
 					JSONObject data = new JSONObject();
 					data.put("Barcode", barcode);
 					js.put("jsonData", data.toString());

+ 13 - 0
src/com/jiaju/adapter/ProductLineExpandableListView.java

@@ -1550,12 +1550,25 @@ public class ProductLineExpandableListView extends ExpandableListView implements
 			Intent i = new Intent();
 			Bundle b = new Bundle();
 			b.putString("procedureName", procedureName);
+			b.putString("procedureMenuCode", procedureMenuCode);
 			b.putString("title", "撤销");
 			i.putExtras(b);
 			i.setClass(mContext, LuociRevokeActivity.class);
 			mContext.startActivity(i);
 
 		} 
+		else if (procedureMenuCode.equals("063403")) {
+			//裸辞交接-撤销单品
+			Intent i = new Intent();
+			Bundle b = new Bundle();
+			b.putString("procedureName", procedureName);
+			b.putString("title", "撤销单品");
+			b.putString("procedureMenuCode", procedureMenuCode);
+			i.putExtras(b);
+			i.setClass(mContext, LuociRevokeActivity.class);
+			mContext.startActivity(i);
+
+		} 
 		else if (procedureMenuCode.equals("900601")) {
 			Intent i = new Intent();
 			Bundle b = new Bundle();