From 0611ee92072749f5f03c9543617a5dba44d3783d Mon Sep 17 00:00:00 2001 From: mas-elkhanza Date: Tue, 31 Jan 2023 08:05:02 +0700 Subject: [PATCH] Sudah Fix, Riwayat Barang Dapur --- nbproject/private/private.xml | 5 +++-- sik.sql | 2 +- src/dapur/DapurRiwayatBarang.java | 31 ++++++++++--------------------- src/ipsrs/IPSRSRiwayatBarang.java | 31 ++++++++++--------------------- src/simrskhanza/DlgAbout.form | 2 +- src/simrskhanza/DlgAbout.java | 2 +- 6 files changed, 26 insertions(+), 47 deletions(-) diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 1193cded668..77110d145d7 100755 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -20,10 +20,11 @@ + file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/setting/DlgUpdateUser.java file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/simrskhanza/frmUtama.java - file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/dapur/DapurPengeluaran.java + file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/dapur/DapurRiwayatBarang.java file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/setting/DlgUser.java - file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/dapur/DapurCariPengeluaran.java + file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/fungsi/akses.java diff --git a/sik.sql b/sik.sql index d226afd9f56..b38c3aff908 100644 --- a/sik.sql +++ b/sik.sql @@ -30702,4 +30702,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-01-31 6:28:10 +-- Dump completed on 2023-01-31 8:05:01 diff --git a/src/dapur/DapurRiwayatBarang.java b/src/dapur/DapurRiwayatBarang.java index f512d4218ac..d575a4b2ae2 100644 --- a/src/dapur/DapurRiwayatBarang.java +++ b/src/dapur/DapurRiwayatBarang.java @@ -399,11 +399,9 @@ private void BtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS "dapur_riwayat_barang.jam,dapur_riwayat_barang.petugas,"+ "dapur_riwayat_barang.status from dapur_riwayat_barang "+ "inner join dapurbarang on dapur_riwayat_barang.kode_brng=dapurbarang.kode_brng where "+ - "dapur_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and dapurbarang.nama_brng like '%"+nmbar.getText()+"%' and dapur_riwayat_barang.kode_brng like '%"+TCari.getText().trim()+"%' or "+ - "dapur_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and dapurbarang.nama_brng like '%"+nmbar.getText()+"%' and dapurbarang.nama_brng like '%"+TCari.getText().trim()+"%' or "+ - "dapur_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and dapurbarang.nama_brng like '%"+nmbar.getText()+"%' and dapur_riwayat_barang.petugas like '%"+TCari.getText().trim()+"%' or "+ - "dapur_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and dapurbarang.nama_brng like '%"+nmbar.getText()+"%' and dapur_riwayat_barang.status like '%"+TCari.getText().trim()+"%' "+ - "order by dapur_riwayat_barang.tanggal,dapur_riwayat_barang.jam ",param); + "dapur_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and dapurbarang.nama_brng like '%"+nmbar.getText()+"%' and "+ + "(dapur_riwayat_barang.kode_brng like '%"+TCari.getText().trim()+"%' or dapurbarang.nama_brng like '%"+TCari.getText().trim()+"%' or dapur_riwayat_barang.petugas like '%"+TCari.getText().trim()+"%' or "+ + "dapur_riwayat_barang.status like '%"+TCari.getText().trim()+"%') order by dapur_riwayat_barang.tanggal,dapur_riwayat_barang.jam ",param); } this.setCursor(Cursor.getDefaultCursor()); @@ -559,10 +557,10 @@ private void prosesCari() { "dapur_riwayat_barang.jam,dapur_riwayat_barang.petugas,"+ "dapur_riwayat_barang.status from dapur_riwayat_barang "+ "inner join dapurbarang on dapur_riwayat_barang.kode_brng=dapurbarang.kode_brng where "+ - "dapur_riwayat_barang.tanggal between ? and ? and dapurbarang.nama_brng like ? and dapur_riwayat_barang.kode_brng like ? or "+ - "dapur_riwayat_barang.tanggal between ? and ? and dapurbarang.nama_brng like ? and dapurbarang.nama_brng like ? or "+ - "dapur_riwayat_barang.tanggal between ? and ? and dapurbarang.nama_brng like ? and dapur_riwayat_barang.petugas like ? or "+ - "dapur_riwayat_barang.tanggal between ? and ? and dapurbarang.nama_brng like ? and dapur_riwayat_barang.status like ? order by dapur_riwayat_barang.tanggal,dapur_riwayat_barang.jam "); + "dapur_riwayat_barang.tanggal between ? and ? and dapurbarang.nama_brng like ? and "+ + "(dapur_riwayat_barang.kode_brng like ? or dapurbarang.nama_brng like ? or "+ + "dapur_riwayat_barang.petugas like ? or dapur_riwayat_barang.status like ?) "+ + "order by dapur_riwayat_barang.tanggal,dapur_riwayat_barang.jam "); } try { @@ -574,18 +572,9 @@ private void prosesCari() { ps.setString(2,Valid.SetTgl(Tgl2.getSelectedItem()+"")); ps.setString(3,"%"+nmbar.getText()+"%"); ps.setString(4,"%"+TCari.getText().trim()+"%"); - ps.setString(5,Valid.SetTgl(Tgl1.getSelectedItem()+"")); - ps.setString(6,Valid.SetTgl(Tgl2.getSelectedItem()+"")); - ps.setString(7,"%"+nmbar.getText()+"%"); - ps.setString(8,"%"+TCari.getText().trim()+"%"); - ps.setString(9,Valid.SetTgl(Tgl1.getSelectedItem()+"")); - ps.setString(10,Valid.SetTgl(Tgl2.getSelectedItem()+"")); - ps.setString(11,"%"+nmbar.getText()+"%"); - ps.setString(12,"%"+TCari.getText().trim()+"%"); - ps.setString(13,Valid.SetTgl(Tgl1.getSelectedItem()+"")); - ps.setString(14,Valid.SetTgl(Tgl2.getSelectedItem()+"")); - ps.setString(15,"%"+nmbar.getText()+"%"); - ps.setString(16,"%"+TCari.getText().trim()+"%"); + ps.setString(5,"%"+TCari.getText().trim()+"%"); + ps.setString(6,"%"+TCari.getText().trim()+"%"); + ps.setString(7,"%"+TCari.getText().trim()+"%"); } rs=ps.executeQuery(); while(rs.next()){ diff --git a/src/ipsrs/IPSRSRiwayatBarang.java b/src/ipsrs/IPSRSRiwayatBarang.java index c2f5d4b2e10..6c5dae54e1f 100755 --- a/src/ipsrs/IPSRSRiwayatBarang.java +++ b/src/ipsrs/IPSRSRiwayatBarang.java @@ -399,11 +399,9 @@ private void BtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS "ipsrs_riwayat_barang.jam,ipsrs_riwayat_barang.petugas,"+ "ipsrs_riwayat_barang.status from ipsrs_riwayat_barang "+ "inner join ipsrsbarang on ipsrs_riwayat_barang.kode_brng=ipsrsbarang.kode_brng where "+ - "ipsrs_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and ipsrsbarang.nama_brng like '%"+nmbar.getText()+"%' and ipsrs_riwayat_barang.kode_brng like '%"+TCari.getText().trim()+"%' or "+ - "ipsrs_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and ipsrsbarang.nama_brng like '%"+nmbar.getText()+"%' and ipsrsbarang.nama_brng like '%"+TCari.getText().trim()+"%' or "+ - "ipsrs_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and ipsrsbarang.nama_brng like '%"+nmbar.getText()+"%' and ipsrs_riwayat_barang.petugas like '%"+TCari.getText().trim()+"%' or "+ - "ipsrs_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and ipsrsbarang.nama_brng like '%"+nmbar.getText()+"%' and ipsrs_riwayat_barang.status like '%"+TCari.getText().trim()+"%' "+ - "order by ipsrs_riwayat_barang.tanggal,ipsrs_riwayat_barang.jam ",param); + "ipsrs_riwayat_barang.tanggal between '"+Valid.SetTgl(Tgl1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tgl2.getSelectedItem()+"")+"' and ipsrsbarang.nama_brng like '%"+nmbar.getText()+"%' and "+ + "(ipsrs_riwayat_barang.kode_brng like '%"+TCari.getText().trim()+"%' or ipsrsbarang.nama_brng like '%"+TCari.getText().trim()+"%' or ipsrs_riwayat_barang.petugas like '%"+TCari.getText().trim()+"%' or "+ + "ipsrs_riwayat_barang.status like '%"+TCari.getText().trim()+"%') order by ipsrs_riwayat_barang.tanggal,ipsrs_riwayat_barang.jam ",param); } this.setCursor(Cursor.getDefaultCursor()); @@ -559,10 +557,10 @@ private void prosesCari() { "ipsrs_riwayat_barang.jam,ipsrs_riwayat_barang.petugas,"+ "ipsrs_riwayat_barang.status from ipsrs_riwayat_barang "+ "inner join ipsrsbarang on ipsrs_riwayat_barang.kode_brng=ipsrsbarang.kode_brng where "+ - "ipsrs_riwayat_barang.tanggal between ? and ? and ipsrsbarang.nama_brng like ? and ipsrs_riwayat_barang.kode_brng like ? or "+ - "ipsrs_riwayat_barang.tanggal between ? and ? and ipsrsbarang.nama_brng like ? and ipsrsbarang.nama_brng like ? or "+ - "ipsrs_riwayat_barang.tanggal between ? and ? and ipsrsbarang.nama_brng like ? and ipsrs_riwayat_barang.petugas like ? or "+ - "ipsrs_riwayat_barang.tanggal between ? and ? and ipsrsbarang.nama_brng like ? and ipsrs_riwayat_barang.status like ? order by ipsrs_riwayat_barang.tanggal,ipsrs_riwayat_barang.jam "); + "ipsrs_riwayat_barang.tanggal between ? and ? and ipsrsbarang.nama_brng like ? and "+ + "(ipsrs_riwayat_barang.kode_brng like ? or ipsrsbarang.nama_brng like ? or "+ + "ipsrs_riwayat_barang.petugas like ? or ipsrs_riwayat_barang.status like ?)"+ + "order by ipsrs_riwayat_barang.tanggal,ipsrs_riwayat_barang.jam "); } try { @@ -574,18 +572,9 @@ private void prosesCari() { ps.setString(2,Valid.SetTgl(Tgl2.getSelectedItem()+"")); ps.setString(3,"%"+nmbar.getText()+"%"); ps.setString(4,"%"+TCari.getText().trim()+"%"); - ps.setString(5,Valid.SetTgl(Tgl1.getSelectedItem()+"")); - ps.setString(6,Valid.SetTgl(Tgl2.getSelectedItem()+"")); - ps.setString(7,"%"+nmbar.getText()+"%"); - ps.setString(8,"%"+TCari.getText().trim()+"%"); - ps.setString(9,Valid.SetTgl(Tgl1.getSelectedItem()+"")); - ps.setString(10,Valid.SetTgl(Tgl2.getSelectedItem()+"")); - ps.setString(11,"%"+nmbar.getText()+"%"); - ps.setString(12,"%"+TCari.getText().trim()+"%"); - ps.setString(13,Valid.SetTgl(Tgl1.getSelectedItem()+"")); - ps.setString(14,Valid.SetTgl(Tgl2.getSelectedItem()+"")); - ps.setString(15,"%"+nmbar.getText()+"%"); - ps.setString(16,"%"+TCari.getText().trim()+"%"); + ps.setString(5,"%"+TCari.getText().trim()+"%"); + ps.setString(6,"%"+TCari.getText().trim()+"%"); + ps.setString(7,"%"+TCari.getText().trim()+"%"); } rs=ps.executeQuery(); while(rs.next()){ diff --git a/src/simrskhanza/DlgAbout.form b/src/simrskhanza/DlgAbout.form index d4b392e965d..903312acbe5 100755 --- a/src/simrskhanza/DlgAbout.form +++ b/src/simrskhanza/DlgAbout.form @@ -278,7 +278,7 @@ - + diff --git a/src/simrskhanza/DlgAbout.java b/src/simrskhanza/DlgAbout.java index cae25a63f62..d152dce497f 100755 --- a/src/simrskhanza/DlgAbout.java +++ b/src/simrskhanza/DlgAbout.java @@ -172,7 +172,7 @@ private void initComponents() { jLabel17.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N jLabel17.setForeground(new java.awt.Color(50, 50, 50)); - jLabel17.setText("Update 2022-01-28"); + jLabel17.setText("Update 2022-01-31"); jLabel17.setName("jLabel17"); // NOI18N panelGlass1.add(jLabel17); jLabel17.setBounds(107, 8, 120, 14);