1

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

@@ -16,6 +16,7 @@ import com.winsea.svc.base.base.service.*;
 import com.winsea.svc.base.base.util.DateUtils;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
@@ -974,13 +975,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         else if (flag == 5) {
 //            calendar = Calendar.getInstance();
 //            calendar.add(Calendar.MONTH, -1);
-            List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
-                    .eq("comp_id", compId)
-                    .eq("delete_flag", "0")
-                    .eq("status_flag", "1")
-                    .eq("contract_type", "1")
+            Wrapper<ContractManagementInfo> contractManagementInfoWrapper = new EntityWrapper();
+            contractManagementInfoWrapper.eq("comp_id",compId)
+                    .eq("status_flag","1")
                     .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
-                    .orderBy("update_date", false));
+                    .orderBy("update_date", false);
+            contractManagementInfoWrapper.andNew().eq("contract_type", "1")
+                    .or().eq("agreement_type","代储合同");
+            List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(contractManagementInfoWrapper);
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                         .eq("contract_id", contractManagementInfo.getId()));

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

@@ -1005,7 +1005,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) {
                             //现货销售出库报表
@@ -1039,7 +1039,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("comp_id", warehouseBaseInfo.getCompId())
-                                .eq("contract_type", "1")
+//                                .eq("contract_type", "1")
                                 .eq("deliver_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo1 != null) {
@@ -4319,7 +4319,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) {
                             //现货销售出库报表
@@ -4353,7 +4353,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("comp_id", warehouseBaseInfo.getCompId())
-                                .eq("contract_type", "1")
+//                                .eq("contract_type", "1")
                                 .eq("deliver_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo1 != null) {