diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index a0070396..9122c1c2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -168,27 +168,27 @@ public class PoundlistController { poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); poundlistListVO.setRate("0"); poundlistListVO.setPountType(poundlistListVO.getPoundType()); - poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).toString()); - poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).multiply(new BigDecimal("0.87")).toString()); - poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toString()); + poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).toPlainString()); + poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).multiply(new BigDecimal("0.87")).toPlainString()); + poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString()); switch (poundlistListVO.getSaleRate()) { case "1": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.91")).toString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.91")).toPlainString()); break; case "2": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.94")).toString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.94")).toPlainString()); break; case "3": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.95")).toString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.95")).toPlainString()); break; case "4": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.97")).toString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.97")).toPlainString()); break; case "5": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("1")).toString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("1")).toPlainString()); break; default: - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.87")).toString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.87")).toPlainString()); break; } poundlistListVO.setRateAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) - Double.parseDouble(poundlistListVO.getNotAmount()))); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index edfb1c1f..e1215969 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -69,7 +69,7 @@ WHERE a.delete_mark = 0 and LEFT JOIN jg_natural i on a.natural_id = i.id LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id - where a.is_examine = '1' and a.delete_mark = 0 + where a.is_examine = '1' and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%')) @@ -151,7 +151,7 @@ WHERE a.delete_mark = 0 and LEFT JOIN jg_natural i on a.natural_id = i.id LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id - where a.delete_mark = 0 and a.id = #{id} + where a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and a.id = #{id}