1

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

@@ -1178,6 +1178,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
                                         tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
                                         tranCarInfo.setThreeTranType("散船");
+                                        tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                        stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setShipName(warehouseInOutInfo.getShipName());
                                         stockSaleReceiptReport.setShipNo(warehouseInOutInfo.getShipNumber());
                                     }else if("集装箱船".equals(warehouseInOutInfo.getOutType())){
@@ -1254,6 +1256,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
                                     }else if("散船".equals(warehouseInOutInfo.getOutType())){
+                                        stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setShipName(warehouseInOutInfo.getShipName());
                                         stockSaleReceiptReport.setShipNo(warehouseInOutInfo.getShipNumber());
                                     }else if("集装箱船".equals(warehouseInOutInfo.getOutType())){

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

@@ -80,6 +80,8 @@
         w.back_office as backOffice,
         w.status_flag as statusFlag,
         w.status as status,
+        w.ship_number as shipNumber,
+        w.ship_name as shipName,
         w.create_date as createDate,
         d.water_content as waterContent,
         d.bulk_density as bulkDensity,