From b713f552c1f61e60eafd7f2a9b678e8624ceeaa5 Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 25 Jun 2024 11:10:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/scm/saleCenter/deliveryOrder/form.vue | 8 ++++++++ 1 file changed, 8 insertions(+) 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 59330bff..2480d026 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 @@ -1717,6 +1717,14 @@ export default { item.deliveryNum = undefined item.batchNo = 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 From 4cdd6c31b30286b770885984851d736ec23590e8 Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 25 Jun 2024 13:32:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/scm/VoucherMapper.xml | 10 ++++++++++ .../src/main/java/jnpf/mapper/VoucherMapper.java | 3 +++ .../main/java/jnpf/service/BusinessOrderService.java | 2 +- .../src/main/java/jnpf/service/VoucherService.java | 1 + .../java/jnpf/service/impl/VoucherServiceImpl.java | 5 +++++ .../java/jnpf/controller/BusinessOrderController.java | 7 ++++++- 6 files changed, 26 insertions(+), 2 deletions(-) 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"));