1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StockSaleReceiptReport.java

@@ -41,6 +41,10 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      * 公司id
      */
     private String compId;
+    /**
+     * 出入库记录id
+     */
+    private String warehouseRecordId;
     /**
      * 合同编号
      */

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

@@ -868,6 +868,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
                             stockSaleReceiptReport.setId(IdGenerator.generateUUID());
                             stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
+                            stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
                             stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                             stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -899,6 +900,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //现货销售出库报表
                             StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
                             stockSaleReceiptReport.setId(IdGenerator.generateUUID());
+                            stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
                             stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
                             stockSaleReceiptReport.setProcessNo("退库");
                             stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
@@ -1122,6 +1124,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //现货销售出库报表
                             StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
                             stockSaleReceiptReport.setId(IdGenerator.generateUUID());
+                            stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
                             stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
                             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                                 .eq("contract_no",contractManagementInfo.getContractNo())
@@ -1223,6 +1226,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //现货销售出库报表
                             StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
                             stockSaleReceiptReport.setId(IdGenerator.generateUUID());
+                            stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
                             stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
                             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                                     .eq("contract_no",contractManagementInfo1.getContractNo())