Update CssdBmhpService
Rapi-rapi
This commit is contained in:
parent
5ef1f7c942
commit
d429a087fc
@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
|
||||
import com.jasamedika.medifirst2000.dao.KelompokTransaksiDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProdukDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProdukFormulaProduksiDao;
|
||||
import com.jasamedika.medifirst2000.dao.ProdukProduksiDao;
|
||||
@ -31,7 +30,6 @@ import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
|
||||
import com.jasamedika.medifirst2000.entities.Produk;
|
||||
import com.jasamedika.medifirst2000.entities.ProdukFormulaProduksi;
|
||||
import com.jasamedika.medifirst2000.entities.ProdukProduksi;
|
||||
import com.jasamedika.medifirst2000.entities.Rekanan;
|
||||
import com.jasamedika.medifirst2000.entities.Ruangan;
|
||||
import com.jasamedika.medifirst2000.entities.SatuanStandar;
|
||||
import com.jasamedika.medifirst2000.entities.StokProdukDetail;
|
||||
@ -49,9 +47,7 @@ import com.jasamedika.medifirst2000.vo.CssdBmhpDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO;
|
||||
import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpDetailVO;
|
||||
import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO;
|
||||
import com.jasamedika.medifirst2000.vo.DetilPenerimaanVO;
|
||||
import com.jasamedika.medifirst2000.vo.ProdukVO;
|
||||
import com.jasamedika.medifirst2000.vo.SatuanStandarVO;
|
||||
|
||||
@Service("cssdBmhpService")
|
||||
public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdBmhpService {
|
||||
@ -83,11 +79,11 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
@Autowired
|
||||
private KartuStokService kartuStokService;
|
||||
|
||||
@Autowired
|
||||
private BaseVoConverter<ProdukVO, Produk> produkKonverter;
|
||||
// @Autowired
|
||||
// private BaseVoConverter<ProdukVO, Produk> produkKonverter;
|
||||
|
||||
@Autowired
|
||||
private KelompokTransaksiDao kelompokTransaksiDao;
|
||||
// @Autowired
|
||||
// private KelompokTransaksiDao kelompokTransaksiDao;
|
||||
|
||||
@Autowired
|
||||
private SatuanStandarDao satuanStandarDao;
|
||||
@ -101,8 +97,9 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
@Autowired
|
||||
private StrukPelayananDao strukPelayananDao;
|
||||
|
||||
@Autowired
|
||||
private BaseVoConverter<SatuanStandarVO, SatuanStandar> satuanStandarConverter;
|
||||
// @Autowired
|
||||
// private BaseVoConverter<SatuanStandarVO, SatuanStandar>
|
||||
// satuanStandarConverter;
|
||||
|
||||
@Autowired
|
||||
private BaseVoConverter<ProdukVO, Produk> produkConverter;
|
||||
@ -190,16 +187,15 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
produkProduksi.setProdukHasil(produkConverter.transferVOToModel(vo.getProduk(), new Produk()));
|
||||
}
|
||||
produkProduksi.setQtyProdukAsal(detail.getQty());
|
||||
stokProdukGlobalService.updateStokProdukDetailPemusnahanBarang(detail.getProduk().getId(), r, detail.getQty()*vo.getQtyProduk(), null);
|
||||
stokProdukGlobalService.updateStokPemusnahanBarang(produkProduksi.getProdukAsal(), detail.getQty()*vo.getQtyProduk(), r);
|
||||
stokProdukGlobalService.updateStokProdukDetailPemusnahanBarang(detail.getProduk().getId(), r,
|
||||
detail.getQty() * vo.getQtyProduk(), null);
|
||||
stokProdukGlobalService.updateStokPemusnahanBarang(produkProduksi.getProdukAsal(),
|
||||
detail.getQty() * vo.getQtyProduk(), r);
|
||||
produkProduksiDao.save(produkProduksi);
|
||||
|
||||
|
||||
|
||||
String keterangan = "Produksi Bmhp";
|
||||
Produk p = produkDao.findById(detail.getProduk().getId());
|
||||
|
||||
|
||||
kartuStokService.saveKartuStok(detail.getQty() * vo.getQtyProduk(), p, r, keterangan, false, new Date());
|
||||
}
|
||||
|
||||
@ -228,23 +224,20 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
|
||||
strukPelayanan.setVerifikasi("1");
|
||||
|
||||
Double persenPpn = 0.0;
|
||||
Double persenDiskon = 0.0;
|
||||
Double ppn = 0.0;
|
||||
Double diskon = 0.0;
|
||||
// Double persenPpn = 0.0;
|
||||
// Double persenDiskon = 0.0;
|
||||
// Double ppn = 0.0;
|
||||
// Double diskon = 0.0;
|
||||
Double hargaSatuan = 0.0;
|
||||
|
||||
|
||||
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(vo.getHarga())) {
|
||||
hargaSatuan = vo.getHarga();
|
||||
}
|
||||
|
||||
ppn = ((persenDiskon / hargaSatuan) * 100);
|
||||
diskon = ((persenPpn / hargaSatuan) * 100);
|
||||
Double hargaNetto1 = hargaSatuan + ppn;
|
||||
Double hargaNetto2 = hargaNetto1 - diskon;
|
||||
// ppn = ((persenDiskon / hargaSatuan) * 100);
|
||||
// diskon = ((persenPpn / hargaSatuan) * 100);
|
||||
// Double hargaNetto1 = hargaSatuan + ppn;
|
||||
// Double hargaNetto2 = hargaNetto1 - diskon;
|
||||
|
||||
List<StrukPelayananDetail> listStrukPeayananDetail = new ArrayList<StrukPelayananDetail>();
|
||||
StrukPelayananDetail strukPelayananDetail = new StrukPelayananDetail();
|
||||
@ -395,7 +388,6 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
return setStokprodukDetail;
|
||||
}
|
||||
|
||||
|
||||
// update stok Produk Global
|
||||
public void updateStokGlobal(StrukPelayananDetail detail) {
|
||||
// updateuntuk Stok Produk Global
|
||||
@ -481,7 +473,8 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
}
|
||||
int rowEnd = limit;
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
result.put("data", stokProdukGlobalDaoCustom.daftarBarangBmHpList(rowStart, rowEnd, sort, dir, produkId,r.getId()));
|
||||
result.put("data",
|
||||
stokProdukGlobalDaoCustom.daftarBarangBmHpList(rowStart, rowEnd, sort, dir, produkId, r.getId()));
|
||||
result.put("totalPages", totalPages);
|
||||
result.put("totalRow", totalRow);
|
||||
return result;
|
||||
@ -542,7 +535,7 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
|
||||
@Override
|
||||
public Map<String, Object> detailProdukBmhp(Integer produkId) {
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
result.put("produkBmhp",produkDao.findProdukBmhpById(produkId));
|
||||
result.put("produkBmhp", produkDao.findProdukById(produkId));
|
||||
result.put("bahanMentah", produkDao.findBahanMentah(produkId));
|
||||
return result;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user