移动端磅单

jnpf-app/pages.json

@@ -514,6 +514,12 @@
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},
+				{
+					"path": "purchaseReceiptVoucher/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
 				}
 			]
 		},

jnpf-app/pages/index/portal.vue

@@ -166,6 +166,29 @@
 												v-if="item.show" />
 										</view>
 									</template>
+									</u-row>
+									<u-col span="6">
+											<view class="sty-item sty-item-c">
+												<u-row>
+													<u-col span="12" text-align="center">
+														<view>
+															<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
+														</view>
+													</u-col>
+												</u-row>
+												<u-row>
+													<u-col span="12" text-align="center">
+														<view>
+															采购收货凭证
+														</view>
+													</u-col>
+												</u-row>
+											</view>
+										</u-col>
+										
+									
+									
+									</u-row>
 									
 								</view>
 							</mescroll-body>

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

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<BusinessOrderMapper, B
     @Override
     public List<ProductWarehouseEntity> orderByVoucherInfo(List<String> voucherIds) {
         List<ProductWarehouseEntity> 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()));

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<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> queryVoucherPopupInfo(VoucherPagination voucherPagination) {
+        UserInfo userInfo = userProvider.get();
+        OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
+        List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
+        String organize = JSON.toJSONString(organizeJsonId);
+        organize = organize.replace("[", "");
+        organize = organize.replace("]", "");
         QueryWrapper<VoucherEntity> 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<VoucherMapper, VoucherEntity
                     .or().like("a.voucher_code",voucherPagination.getKeyword()));
         }
         queryWrapper1.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
+        queryWrapper1.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()), "c.product_id", voucherPagination.getProductIdList());
         queryWrapper1.isNull("a.f_delete_mark");
+        queryWrapper1.like("a.organize_json_id", organize);
         queryWrapper1.eq(StringUtils.isNotEmpty(voucherPagination.getBusinessOrderId()),"a.business_order_id",voucherPagination.getBusinessOrderId());
         IPage<VoucherEntity> voucherEntityIPage = new Page<>();
         Page<VoucherEntity> 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<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
-            String organize = JSON.toJSONString(organizeJsonId);
-            organize = organize.replace("[", "");
-            organize = organize.replace("]", "");
             QueryWrapper<VoucherEntity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("a.business_type", voucherPagination.getBusinessType());
             queryWrapper.eq("a.document_type", voucherPagination.getDocumentType());

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;
 
 
 }