Skip to content

Commit

Permalink
[ADD] Mostrar numeros de serie.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergio-teruel
sergio-teruel committed Feb 16, 2015
1 parent 9f73459 commit c8622b8
Show file tree
Hide file tree
Showing 14 changed files with 513 additions and 144 deletions.
11 changes: 11 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
android:label="@string/title_activity_recepciones" >
</activity>
<activity
android:name=".MovArticuloSerieDetail"
android:label="@string/title_activity_mov_articulo_serie_detail" >
android:name=".MovArticuloSerie"
android:label="@string/title_activity_mov_articulo_serie" >
</activity>
</application>

Expand Down
46 changes: 43 additions & 3 deletions app/src/main/java/es/incaser/apps/stockcontrol/BarcodeReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@
import android.database.Cursor;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.text.util.Linkify;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.EditText;
import android.widget.ImageButton;
Expand All @@ -22,7 +27,7 @@
import java.util.UUID;


public class BarcodeReader extends ActionBarActivity {
public class BarcodeReader extends ActionBarActivity{
String tipoMov;
String serieMov;
String documentoMov;
Expand Down Expand Up @@ -74,15 +79,38 @@ public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}


public void addListenerOnButtonRead() {
btnReader = (ImageButton) findViewById(R.id.btn_read);
txtBarcode = (EditText) findViewById(R.id.txt_barcodeReader);

txtBarcode.setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_UP){
switch (keyCode) {
case KeyEvent.KEYCODE_ENTER:
// if (txtBarcode.getText().toString().length() < 13) {
// txtBarcode.setText(String.format("%013d", Long.parseLong(txtBarcode.getText().toString())));
// }
leerCodigo(txtBarcode.getText().toString());
txtBarcode.setText("");
return true;
default:
break;
}
}
return false;
}
});


btnReader.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (txtBarcode.getText().toString().length() > 10){
leerCodigo(txtBarcode.getText().toString());
txtBarcode.setText("");
}else {
Toast.makeText(v.getContext(), "Código demasiado corto", Toast.LENGTH_SHORT).show();
}
Expand All @@ -94,6 +122,17 @@ public void linkListViewMovimientoStock(){
lvMovimientoStock = (ListView) findViewById(R.id.lv_movimientoStock);
movStockAdapter = new MovStockAdapter(this);
lvMovimientoStock.setAdapter(movStockAdapter);
lvMovimientoStock.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Intent intent = new Intent(view.getContext(), MovArticuloSerie.class);
intent.putExtra("tipoMov", tipoMov);
intent.putExtra("serieMov", serieMov);
intent.putExtra("documentoMov", documentoMov);
intent.putExtra("codArticulo", movStockAdapter.getMovimiento("CodigoArticulo"));
startActivity(intent);
}
});
}

public void linkButtonCamera() {
Expand Down Expand Up @@ -132,7 +171,7 @@ private void updateUITextViews(String scan_result, String scan_result_format) {
public class MovStockAdapter extends BaseAdapter{
Context context;
Cursor cursor;

public MovStockAdapter(Context ctx){
context = ctx;
dbAdapter = new DbAdapter(context);
Expand Down Expand Up @@ -202,7 +241,8 @@ public View getView(int position, View convertView, ViewGroup parent) {

private String getMovimiento(String column) {
return cursor.getString(cursor.getColumnIndex(column));
}
}

}

private void leerCodigo(String barCode){
Expand Down
92 changes: 7 additions & 85 deletions app/src/main/java/es/incaser/apps/stockcontrol/DbAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,13 @@ public Cursor getMovArticuloSerieByDoc(String codigoEmpresa, String tipoMovimien
return cur;
}

public Cursor getMovArticuloSerieByDoc(String codigoEmpresa, String tipoMovimiento, String serie, String documento, String articulo) {
String where ="CodigoEmpresa=? AND OrigenDocumento=? AND SerieDocumento=? AND Documento=? AND CodigoArticulo=?";
Cursor cur = db.query("MovimientoArticuloSerie", new String[]{"*"}, where,
new String[]{codigoEmpresa, TipoMovimiento.origenMov(tipoMovimiento), serie, documento, articulo}, "", "", "");
return cur;
}

public void updateUnidadesMovStock(String codigoEmpresa, String tipoMovimiento, String serie, String documento) {
String sql = "UPDATE MovimientoStock SET Unidades = (SELECT COUNT(id) " +
"FROM MovimientoArticuloSerie " +
Expand Down Expand Up @@ -512,22 +519,6 @@ SQLiteDatabase getDb() {
return db;
}

public Cursor getUltimoArqueo(String empresa, String establecimiento, String maquina) {
String[] cols = new String[]{"INC_FechaRecaudacion", "INC_ValorArqueoTeorico"};
String where = "INC_ArqueoRealizado<>0 AND CodigoEmpresa=? AND INC_CodigoEstablecimiento=? AND INC_CodigoMaquina=?";
String[] whereArgs = new String[]{empresa, establecimiento, maquina};

return db.query("RecaudacionesAnteriores", cols, where, whereArgs, "", "", "INC_FechaRecaudacion DESC, INC_HoraRecaudacion DESC", "1");
}

public Cursor getUltimaRecaudacion(String empresa, String establecimiento, String maquina) {
String[] cols = new String[]{"*"};
String where = "CodigoEmpresa=? AND INC_CodigoEstablecimiento=? AND INC_CodigoMaquina=?";
String[] whereArgs = new String[]{empresa, establecimiento, maquina};

return db.query("RecaudacionesAnteriores", cols, where, whereArgs, "", "", "INC_FechaRecaudacion DESC, INC_HoraRecaudacion DESC", "1");
}

public Cursor getIncidencias(String empresa, String establecimiento, String maquina) {
return getIncidencias(empresa, establecimiento, maquina, false);
}
Expand All @@ -550,73 +541,4 @@ public Cursor getIncidencia(long idIncidencia) {

return db.query("INC_Incidencias", cols, where, whereArgs, "", "", "");
}


public Cursor getRecuperacionesPrestamo(String empresa, String codigoPrestamo) {
String[] cols = new String[]{"*"};
String where = "CodigoEmpresa=? AND INC_CodigoPrestamo=?";
String[] whereArgs = new String[]{empresa, codigoPrestamo};

return db.query("INC_RecuperacionesPrestamo", cols, where, whereArgs,
"", "", "INC_FechaRecuperacion DESC");
}

public Cursor getSumasDesde(String empresa, String establecimiento, String maquina, String fechaDesde) {
String[] cols = new String[]{"SUM(INC_Bruto) AS SumaBruto",
"SUM(INC_JugadoTeorico) AS SumaJugadoTeorico",
"SUM(INC_PremioTeorico) AS SumaPremioTeorico",
"SUM(INC_ImporteRetencion) AS SumaImporteRetencion",
"SUM(INC_RecuperaCargaEmpresa) AS SumaRecuperaCargaEmpresa",
"SUM(INC_RecuperaCargaEstablecimiento) AS SumaRecuperaCargaEstablecimiento",
"SUM(INC_CargaHopperEmpresa) AS SumaCargaHopperEmpresa",
"SUM(INC_CargaHopperEstablecimiento) AS SumaCargaHopperEstablecimiento"};
String where = "CodigoEmpresa=? AND INC_CodigoEstablecimiento=? AND INC_CodigoMaquina=? AND INC_FechaRecaudacion > ?";
String[] whereArgs = new String[]{empresa, establecimiento, maquina, fechaDesde};

return db.query("RecaudacionesAnteriores", cols, where, whereArgs, "", "", "INC_FechaRecaudacion DESC, INC_HoraRecaudacion DESC", "1");
}

public void deleteRecaudacion(String idRecaudacion) {
db.delete("INC_LineasRecaudacion", "id=?", new String[]{idRecaudacion});
}

public void deleteCabRecaudacion(String idCabRecaudacion) {
db.delete("INC_CabeceraRecaudacion", "id=?", new String[]{idCabRecaudacion});
}

public void deleteRecuperacion(String idRecuperacion) {
db.delete("INC_RecuperacionesPrestamo", "id=?", new String[]{idRecuperacion});
}

public float getTotalRecuperaPrestamo(String codigoRecaudacion) {
String[] cols = new String[]{"SUM(ImporteLiquido) AS SumaImporteLiquido"};
String where = "INC_CodigoRecaudacion=?";
String[] whereArgs = new String[]{codigoRecaudacion};

Cursor cur = db.query( "INC_RecuperacionesPrestamo", cols, where, whereArgs, "", "", "");
if (cur.moveToFirst()){
return cur.getFloat(0);
}else {
return 0;
}
}

public Cursor getTotalRecaudadoAll() {
String[] campos = new String[]{
"SUM(INC_TotalRecaudacion) AS INC_TotalRecaudacion",
"SUM(INC_TotalRetencion) AS INC_TotalRetencion",
"SUM(INC_TotalNeto) AS INC_TotalNeto",
"SUM(INC_TotalEstablecimiento) AS INC_TotalEstablecimiento",
"SUM(INC_TotalNetoMasRetencion) AS INC_TotalNetoMasRetencion",
"SUM(INC_TotalRecuperaCarga) AS INC_TotalRecuperaCarga",
"SUM(INC_TotalRecuperaPrestamo) AS INC_TotalRecuperaPrestamo",
"SUM(INC_TotalSaldo) AS INC_TotalSaldo",
"SUM(INC_MaquinasRecaudadas) AS INC_MaquinasRecaudadas"
};
String where = "";
String[] whereArgs = new String[]{};

return db.query( "INC_CabeceraRecaudacion", campos, where, whereArgs, "", "", "");
}

}
Loading

0 comments on commit c8622b8

Please sign in to comment.