对账单查询

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundProductMapper.xml

@@ -54,7 +54,7 @@
                 LEFT JOIN jg_subject_basic f ON e.first_subject_basic_id = f.id
                 LEFT JOIN jg_contract g ON e.contract_id = g.id
         WHERE
-            a.id = #{id}
+            a.document_no = #{id}
           AND c.business_type = '1'
           AND a.f_delete_mark IS NULL
     </select>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java

@@ -1154,7 +1154,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                                     DeliveryOrderEntity deliveryOrderEntity = deliveryOrderService.getInfo(warehousingOutboundEntityList.get(0).getWarehousingId());
                                     if (ObjectUtil.isNotEmpty(deliveryOrderEntity)) {
                                         BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(deliveryOrderEntity.getBusinessId());
-                                        List<WarehousingOutboundProductEntity> warehousingOutboundProductList = warehousingOutboundProductService.queryOutboundProductPurchase(model.getAccountId());
+                                        List<WarehousingOutboundProductEntity> warehousingOutboundProductList = warehousingOutboundProductService.queryOutboundProductPurchase(cwaccountstorageEntity.getDocumentNo());
                                         for (WarehousingOutboundProductEntity warehousingOutboundProductEntity : warehousingOutboundProductList) {
                                             settlementRelationSaleEntity.setPurchaseCode(warehousingOutboundProductEntity.getCode()); //采购订单
                                             settlementRelationSaleEntity.setContract(warehousingOutboundProductEntity.getContractName()); //采购合同编号
@@ -1183,9 +1183,12 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                                             settlementRelationSaleEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
                                             settlementRelationSaleEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
                                             settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
+
+                                            settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
+
                                         }
                                     }
-                                    settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
+//                                    settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
 
 
                                 }