IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Políčka s číslem faktury a fakturovanou částkou odstraněna z objednávek.

Browse Source 
closes #163
This commit is contained in:
František Přibyl
2014-10-24 09:19:15 +02:00
parent 3558d1bd50
commit f1ca2d11c8
10 changed files with 67 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/data/Order.java
-27
View File
@@ -113,17 +113,10 @@ public class Order extends BaseData implements Cloneable
@Column(name = "INVOICED")
private boolean invoiced;
@Column(name = "INVOICE_NUMBER")
private String invoiceNumber;
@Column(name = "INVOICE_TOTAL", precision = 15, scale = 4)
private BigDecimal invoiceTotal;
public Order()
{
this.items = new ArrayList<OrderItem>();
this.total = BigDecimal.ZERO;
this.invoiceTotal = BigDecimal.ZERO;
}
public String getNumser()
@@ -242,16 +235,6 @@ public class Order extends BaseData implements Cloneable
this.invoiced = invoiced;
}
public String getInvoiceNumber()
{
return invoiceNumber;
}
public void setInvoiceNumber(String invoiceNumber)
{
this.invoiceNumber = invoiceNumber;
}
public boolean isOrdered()
{
return ordered;
@@ -282,16 +265,6 @@ public class Order extends BaseData implements Cloneable
this.total = total;
}
public BigDecimal getInvoiceTotal()
{
return invoiceTotal;
}
public void setInvoiceTotal(BigDecimal invoiceTotal)
{
this.invoiceTotal = invoiceTotal;
}
public boolean isIcludedRequirementItemFromAnotherOrder()
{
for (OrderItem oItem : this.getItems())
src/main/java/info/bukova/isspst/data/OrderItem.java
+60 -49
View File
@@ -14,53 +14,53 @@ import javax.persistence.Table;
@Entity
@Table(name = "ORDER_ITEM")
public class OrderItem {
public class OrderItem
{
@Id
@Column(name="ID")
@GeneratedValue
@Column(name = "ID")
@GeneratedValue
private int id;
@Column(name = "CODE")
private String code;
@Column(name = "NAME")
private String name;
@Column(name = "TEXTITEM")
private String textItem;
@Column(name = "QUANTITY", precision=15, scale=4)
@Column(name = "QUANTITY", precision = 15, scale = 4)
private BigDecimal quantity;
@Embedded
private MUnitEmb munit;
@Column(name = "UNITPRICE", precision=15, scale=4)
@Column(name = "UNITPRICE", precision = 15, scale = 4)
private BigDecimal unitPrice;
@Column(name = "TOTAL", precision=15, scale=4)
@Column(name = "TOTAL", precision = 15, scale = 4)
private BigDecimal total;
@Column(name = "DESCRIPTION")
private String description;
@Column(name = "TOTALINVOICE", precision = 15, scale = 4)
private BigDecimal totalInvoice;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "REQUIREMENT_ITEM_ID")
private RequirementItem reqItem;
@ManyToOne
@JoinColumn(name = "ORDER_ID")
private Order order;
public OrderItem() {
public OrderItem()
{
super();
}
public OrderItem(RequirementItem reqItem) {
public OrderItem(RequirementItem reqItem)
{
super();
this.reqItem = reqItem;
this.code = reqItem.getCode();
@@ -71,104 +71,115 @@ public class OrderItem {
this.munit = reqItem.getMunit();
this.total = reqItem.getTotal();
this.description = reqItem.getDescription();
this.totalInvoice = BigDecimal.ZERO;
}
public int getId() {
public int getId()
{
return id;
}
public void setId(int id) {
public void setId(int id)
{
this.id = id;
}
public String getCode() {
public String getCode()
{
return code;
}
public void setCode(String code) {
public void setCode(String code)
{
this.code = code;
}
public String getName() {
public String getName()
{
return name;
}
public void setName(String name) {
public void setName(String name)
{
this.name = name;
}
public String getTextItem() {
public String getTextItem()
{
return textItem;
}
public void setTextItem(String textItem) {
public void setTextItem(String textItem)
{
this.textItem = textItem;
}
public BigDecimal getQuantity() {
public BigDecimal getQuantity()
{
return quantity;
}
public void setQuantity(BigDecimal quantity) {
public void setQuantity(BigDecimal quantity)
{
this.quantity = quantity;
}
public MUnitEmb getMunit() {
public MUnitEmb getMunit()
{
return munit;
}
public void setMunit(MUnitEmb munit) {
public void setMunit(MUnitEmb munit)
{
this.munit = munit;
}
public BigDecimal getUnitPrice() {
public BigDecimal getUnitPrice()
{
return unitPrice;
}
public void setUnitPrice(BigDecimal unitPrice) {
public void setUnitPrice(BigDecimal unitPrice)
{
this.unitPrice = unitPrice;
}
public BigDecimal getTotal() {
public BigDecimal getTotal()
{
return total;
}
public void setTotal(BigDecimal total) {
public void setTotal(BigDecimal total)
{
this.total = total;
}
public String getDescription() {
public String getDescription()
{
return description;
}
public void setDescription(String description) {
public void setDescription(String description)
{
this.description = description;
}
public BigDecimal getTotalInvoice()
public RequirementItem getReqItem()
{
return totalInvoice;
}
public void setTotalInvoice(BigDecimal totalInvoice)
{
this.totalInvoice = totalInvoice;
}
public RequirementItem getReqItem() {
return reqItem;
}
public void setReqItem(RequirementItem reqItem) {
public void setReqItem(RequirementItem reqItem)
{
this.reqItem = reqItem;
}
public Order getOrder() {
public Order getOrder()
{
return order;
}
public void setOrder(Order order) {
public void setOrder(Order order)
{
this.order = order;
}
src/main/java/info/bukova/isspst/filters/OrderFilter.java
-5
View File
@@ -49,9 +49,6 @@ public class OrderFilter implements Filter<Order>
// condition.getTotal());
boolean foundDeliveryDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveryDate(), condition.getDeliveryDate());
boolean foundDeliveredDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveredDate(), condition.getDeliveredDate());
boolean foundInvoiceNumber = StringUtils.isEqualForFilter(item.getInvoiceNumber(), condition.getInvoiceNumber());
boolean foundInvoiceTotal = true;// BigDecimalUtils.isEqualByDecimalForFilter(item.getInvoiceTotal(),
// condition.getInvoiceTotal());
boolean foundSupplierAddr = AddressEmb.isEqualByAddressEmbForFilter(item.getSuplier(), condition.getSuplier());
boolean foundDeliveryAddr = AddressEmb.isEqualByAddressEmbForFilter(item.getDeliveryAddress(), condition.getDeliveryAddress());
boolean foundInvoiceAddr = AddressEmb.isEqualByAddressEmbForFilter(item.getAddress(), condition.getAddress());
@@ -63,8 +60,6 @@ public class OrderFilter implements Filter<Order>
&& foundTotal
&& foundDeliveryDate
&& foundDeliveredDate
&& foundInvoiceNumber
&& foundInvoiceTotal
&& foundSupplierAddr
&& foundDeliveryAddr
&& foundInvoiceAddr
src/main/java/info/bukova/isspst/services/approved/OrderService.java
-2
View File
@@ -22,7 +22,5 @@ public interface OrderService extends Service<Order> {
public BigDecimal calcSumTotalFromItems(List<OrderItem> items);
public BigDecimal calcSumTotalInvoiceFromItems(List<OrderItem> items);
public void updateApprovedItems(Order order, boolean orderedChanged);
}
src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java
+6 -27
View File
@@ -52,10 +52,13 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
@Override
@Transactional
public BigDecimal totalOrderedForWorkgroup(Workgroup workgroup) {
Query q = dao.getQuery("select sum(oi.totalInvoice) from OrderItem oi join oi.reqItem ri join ri.requirement rq join rq.workgroup w where (ri.orderNum is not null or ri.orderNum = '') and w = :workgroup ");
public BigDecimal totalOrderedForWorkgroup(Workgroup workgroup)
{
Query q = dao.getQuery("select sum(oi.total) "
+ "from OrderItem oi join oi.reqItem ri join ri.requirement rq join rq.workgroup w "
+ "where (ri.orderNum is not null or ri.orderNum = '') and w = :workgroup ");
q.setParameter("workgroup", workgroup);
return (BigDecimal)q.uniqueResult();
return (BigDecimal) q.uniqueResult();
}
@Override
@@ -177,30 +180,6 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
return sumTotal;
}
@Override
public BigDecimal calcSumTotalInvoiceFromItems(List<OrderItem> items)
{
BigDecimal sumTotal = BigDecimal.ZERO;
if (items != null)
{
for (OrderItem item : items)
{
if (item != null)
{
BigDecimal total = item.getTotalInvoice();
if (total != null)
{
sumTotal = sumTotal.add(total);
}
}
}
}
return sumTotal;
}
@Transactional
public void updateApprovedItems(Order order, boolean orderedChanged)
{
src/main/java/info/bukova/isspst/ui/ListViewModel.java
-20
View File
@@ -335,26 +335,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
}
}
// private void loadFromDb() {
// Thread fillThread = new Thread(new Runnable() {
//
// @Override
// public void run() {
// tmpList = service.getAll();
//
// try {
// Thread.sleep(200);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
//
// fullFill = true;
// }
// });
//
// fillThread.start();
// }
@Command
public void onPrint() {
Map<String, Object> params = new HashMap<String, Object>();
src/main/java/info/bukova/isspst/ui/main/orders/created/OrderForm.java
-30
View File
@@ -278,36 +278,6 @@ public class OrderForm extends FormViewModel<Order>
this.calcAndUpdateFormTotalPrice(form);
}
protected void calcAndUpdateFormTotalInvoicePrice(SimpleForm form)
{
if (form != null)
{
BigDecimal sumTotal = orderService.calcSumTotalInvoiceFromItems(this.getDataBean().getItems());
form.setField("invoiceTotal", sumTotal);
BindUtils.postNotifyChange(null, null, form, "*");
}
}
@Command
@NotifyChange({ "selectedItem", "syncOrderItems" })
public void recalculateTotalInvoice(@BindingParam("form") SimpleForm form, @BindingParam("changed") String source)
{
if (this.selectedItem == null)
{
log.warn("Zavolat z formuláře onFocus pro nastavení vybrané položky!");
return;
}
if ((source != null) && (source.equals("totalInvoice")))
{
// Calculate total price at form
this.calcAndUpdateFormTotalInvoicePrice(form);
return;
}
log.warn("Dopracovat přepočet fakturované částky objednávky i pro další případy!");
}
@Override
protected void doSave()
{
src/main/java/info/bukova/isspst/ui/renderers/OrderCreatedItemRenderer.java
+1 -10
View File
@@ -2,8 +2,6 @@ package info.bukova.isspst.ui.renderers;
import info.bukova.isspst.data.Order;
import java.math.BigDecimal;
import org.zkoss.zul.Listbox;
import org.zkoss.zul.Listitem;
@@ -17,19 +15,12 @@ public class OrderCreatedItemRenderer extends GenericListitemRenderer<Order>
boolean objednano = order.isOrdered();
BigDecimal invoiceTotal = order.getInvoiceTotal();
boolean zakoupeno = ((invoiceTotal != null) && (invoiceTotal.compareTo(BigDecimal.ZERO) != 0));
boolean doruceno = (zakoupeno && (order.getDeliveredDate() != null));
boolean doruceno = (order.getDeliveredDate() != null);
if (doruceno)
{
li.setSclass("order-select-delivered");
}
else if (zakoupeno)
{
li.setSclass("order-select-invoiced");
}
else if (objednano)
{
li.setSclass("order-select-ordered");
src/main/webapp/main/orders/created/grid.zul
-32
View File
@@ -52,15 +52,6 @@
hflex="10"
sort="auto(deliveredDate))"
label="${labels.OrderFormDeliveredDate}" />
<listheader
hflex="10"
sort="auto(invoiceNumber)"
label="${labels.OrderFormInvoiceNumber}" />
<listheader
hflex="7"
align="right"
sort="auto(invoiceTotal)"
label="${labels.OrderFormInvoiceTotal}" />
<listheader
hflex="15"
sort="auto(suplier.company)"
@@ -160,21 +151,6 @@
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.invoiceNumber)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader></auxheader>
<auxheader>
<div zclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
@@ -275,8 +251,6 @@
<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.deliveredDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.invoiceNumber)" />
<listcell label="@load(each.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.suplier)" />
<listcell label="@load(each.deliveryAddress)" />
<listcell label="@load(each.address)" />
@@ -327,11 +301,6 @@
hflex="15"
sort="czech(description)"
label="${labels.RequirementItemDescription}" />
<listheader
hflex="7"
align="right"
sort="auto(totalInvoice)"
label="${labels.OrderFormInvoiceTotal}" />
<listheader
hflex="5"
sort="auto(reqItem.orderNum)"
@@ -347,7 +316,6 @@
<listcell label="@load(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.description)" />
<listcell label="@load(each.totalInvoice) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.reqItem.orderNum)" />
</listitem>
</template>
src/main/webapp/main/orders/created/orderForm.zul
-35
View File
@@ -104,27 +104,6 @@
format="${labels.DateFormat}" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormInvoiceNumber} :</cell>
<cell>
<textbox
id="idInvoiceNumber"
width="150px"
value="@bind(fx.invoiceNumber)"
placeholder="${labels.NotYetFilled}..."
readonly="@load(empty fx.created)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormInvoiceTotal} :</cell>
<cell>
<textbox
id="idOrderInvoiceTotal"
readonly="true"
width="150px"
value="@bind(fx.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormDescription} :</cell>
<cell>
@@ -543,11 +522,6 @@
hflex="15"
sort="czech(description)"
label="${labels.RequirementItemDescription}" />
<listheader
hflex="7"
align="right"
sort="auto(totalInvoice)"
label="${labels.OrderFormInvoiceTotal}" />
<listheader
hflex="5"
sort="auto(reqItem.orderNum)"
@@ -587,15 +561,6 @@
value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell label="@load(each.description)" />
<listcell>
<textbox
inplace="true"
sclass="grid-textbox-max-right"
readonly="false"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculateTotalInvoice', form=fx, changed='totalInvoice')"
value="@bind(each.totalInvoice) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell label="@load(each.reqItem.orderNum)" />
</listitem>
</template>