diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 5315f45b..b690f62c 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -514,6 +514,12 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "purchaseReceiptVoucher/index",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
]
},
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 92801ace..854368cf 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -166,6 +166,29 @@
v-if="item.show" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 采购收货凭证
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
index 1e17908c..2e05a3f9 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
@@ -661,7 +661,8 @@
a.tare_weight as tareWeight,
a.buckle_weight as buckleWeight,
IFNULL(c.purchase_amount,0) as purchaseAmount,
- IFNULL(c.sale_amount,0) as saleAmount
+ IFNULL(c.sale_amount,0) as saleAmount,
+ c.order_no as orderNo
FROM
`jg_voucher_product` a
RIGHT JOIN jg_voucher c ON a.voucher_id = c.id AND c.f_delete_mark IS NULL
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
index 5fd7ee12..7155047d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
@@ -887,7 +887,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl orderByVoucherInfo(List voucherIds) {
List productWarehouseEntityList = businessOrderMapper.orderByVoucher(voucherIds);
- productWarehouseEntityList = productWarehouseEntityList.stream().collect(Collectors.toMap(s-> s.getId()+";"+s.getUnit(),a->a,(o1,o2) -> {
+ productWarehouseEntityList = productWarehouseEntityList.stream().collect(Collectors.toMap(s-> s.getId()+";"+s.getUnit()+";"+s.getOrderNo(),a->a,(o1,o2) -> {
o1.setNetWeight(o1.getNetWeight().add(o2.getNetWeight()));
o1.setGrossWeight(o1.getGrossWeight().add(o2.getGrossWeight()));
o1.setTareWeight(o1.getTareWeight().add(o2.getTareWeight()));
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 661d3f1e..3300934b 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
@@ -764,6 +764,12 @@ public class VoucherServiceImpl extends ServiceImpl queryVoucherPopupInfo(VoucherPagination voucherPagination) {
+ UserInfo userInfo = userProvider.get();
+ OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
+ List organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
+ String organize = JSON.toJSONString(organizeJsonId);
+ organize = organize.replace("[", "");
+ organize = organize.replace("]", "");
QueryWrapper queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("a.business_type",voucherPagination.getBusinessType());
queryWrapper1.eq("a.document_type",voucherPagination.getDocumentType());
@@ -775,18 +781,14 @@ public class VoucherServiceImpl extends ServiceImpl voucherEntityIPage = new Page<>();
Page page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
voucherEntityIPage = voucherMapper.queryVoucherPopup(page, queryWrapper1,voucherPagination.getBusinessType(),voucherPagination.getDocumentType());
if (voucherEntityIPage.getTotal() == 0) {
- UserInfo userInfo = userProvider.get();
- OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
- List organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
- String organize = JSON.toJSONString(organizeJsonId);
- organize = organize.replace("[", "");
- organize = organize.replace("]", "");
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("a.business_type", voucherPagination.getBusinessType());
queryWrapper.eq("a.document_type", voucherPagination.getDocumentType());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
index 125a0115..54f404cd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
@@ -309,6 +309,8 @@ public class ProductWarehouseEntity {
private BigDecimal saleAmount;
@TableField(exist = false)
private BigDecimal clearWeight;
+ @TableField(exist = false)
+ private String orderNo;
}