1

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

@@ -1537,7 +1537,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("comp_id", warehouseBaseInfo.getCompId())
                                 .eq("deliver_type", "2")
-                                .eq("contract_type", "1")
+//                                .eq("contract_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo != null) {
                             if (contractManagementInfo.getUnitContractPrice() == null) {
@@ -1652,7 +1652,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("comp_id", warehouseBaseInfo.getCompId())
                                 .eq("deliver_type", "1")
-                                .eq("contract_type", "1")
+//                                .eq("contract_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo1 != null) {
                             //现货销售出库报表
@@ -4939,7 +4939,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("comp_id", warehouseBaseInfo.getCompId())
                                 .eq("deliver_type", "2")
-                                .eq("contract_type", "1")
+//                                .eq("contract_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo != null) {
                             if (contractManagementInfo.getUnitContractPrice() == null) {
@@ -5055,7 +5055,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("comp_id", warehouseBaseInfo.getCompId())
                                 .eq("deliver_type", "1")
-                                .eq("contract_type", "1")
+//                                .eq("contract_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo1 != null) {
                             //现货销售出库报表