ccj пре 1 година
родитељ
комит
2c3ce5b6ca

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

@@ -2022,11 +2022,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setId(IdGenerator.generateUUID());
                         stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
                         stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
-                        if(contractManagementInfo != null){
-                            stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
-                        }else{
-                            stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
-                        }
+//                        if(contractManagementInfo != null){
+//                            stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
+//                        }else{
+//                            stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
+//                        }
+                        stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                         stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                         stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));