diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml index d205f43a..cc955e6a 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml @@ -72,6 +72,8 @@ + + @@ -700,4 +702,12 @@ left join jg_business_order_product_relational e on d.id = e.business_order_id and b.product_id = e.product_id and e.f_delete_mark is null where a.f_delete_mark is null and a.is_transfer = '2' and a.business_order_id = #{id} + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java index 4fd7a56e..95fb2e8d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java @@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * voucher @@ -48,4 +49,6 @@ public interface VoucherMapper extends BaseMapper { BigDecimal queryVoucherProductNetWeight(@Param("id") String id); VoucherEntity queryVoucherDetail(@Param("id") String id); BigDecimal queryVoucherByBusinessOrder(@Param("id") String id); + + Map queryAmountByBusinessOrder(@Param("id") String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index 37df5bd1..838345f3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -97,5 +97,5 @@ public interface BusinessOrderService extends IService { void getPdfInfo(BusinessOrderEntity businessOrderEntity, HttpServletResponse response, String token) throws Exception; - BigDecimal getSaleAmountSumInfo(@Param("id") String id); + BigDecimal getSaleAmountSumInfo(String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java index ab9ba753..a9a006d9 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java @@ -77,4 +77,5 @@ public interface VoucherService extends IService { VoucherEntity queryVoucherDetailInfo(String id); BigDecimal queryVoucherProductNetWeightInfo(String id); BigDecimal queryVoucherByBusinessOrderInfo(String id); + Map queryAmountByBusinessOrder(String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index ce096d41..33fbd14b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -1348,4 +1348,9 @@ public class VoucherServiceImpl extends ServiceImpl queryAmountByBusinessOrder(String id) { + return voucherMapper.queryAmountByBusinessOrder(id); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index ac177cdc..c764c27e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -158,7 +158,12 @@ public class BusinessOrderController { // } // } if (saleAmount!=null){ - entity.setProfit(saleAmount.subtract(purchaseAmount));//利润 + if (purchaseAmount.compareTo(BigDecimal.ZERO) == 0){ + Map map = voucherService.queryAmountByBusinessOrder(entity.getId()); + entity.setProfit(map.get("saleAmount").subtract(map.get("purchaseAmount"))); + }else { + entity.setProfit(saleAmount.subtract(purchaseAmount));//利润 + } } Map businessOrderMap=JsonUtil.entityToMap(entity); businessOrderMap.put("id", businessOrderMap.get("id")); diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue index 87bf8cc5..8192e97e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue @@ -1737,6 +1737,14 @@ export default { item.batchNo = undefined item.inventoryNo = undefined item.produceDate = undefined + item.saleNum = 0 + item.grossWeight = 0 + item.tareWeight = 0 + item.buckleWeight = 0 + item.netWeight = 0 + item.clearWeight = 0 + item.taxCount = 0 + item.notTaxCount = 0 this.dataForm.deliveryProductRelationList.push(item) this.childIndex = this.dataForm.deliveryProductRelationList.length - 1 this.isEdit = true