更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -3921,19 +3921,24 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
                             }
                         }
+                        ContractManagementInfo contractManagementInfoSale = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                                .eq("contract_no", warehouseInOutInfo.getContractNo())
+                                .eq("deliver_type", "2")
+                                .eq("contract_type", "1")
+                                .eq("delete_flag", "0"));
                         //现货销售出库报表
                         StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
                         stockSaleReceiptReport.setId(IdGenerator.generateUUID());
                         stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
                         stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
-                        stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
+                        stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                         stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                         stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
                         stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
                         stockSaleReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                        stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                        stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost()==null?(contractManagementInfoSale.getUnitContractPrice()==null?0:contractManagementInfoSale.getUnitContractPrice()):warehouseInOutInfo.getCost())));
                         stockSaleReceiptReport.setAmountEdReceivable(0.0d);
                         stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                         stockSaleReceiptReport.setAmountIngReceivable(stockSaleReceiptReport.getSettlementPrice() * warehouseInOutInfo.getNetWeight());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -281,7 +281,7 @@
         w.box_no_other as boxNoOther,
         w.title_no as titleNo,
         w.title_no_other as titleNoOther,
-        0 as netWeightPrice,
+        w.cost as netWeightPrice,
         ROUND(w.gross_weight,2) as grossWeight,
         ROUND(w.tare,2) as tare,
         w.deduction_weight as buckleWeight,