执行进度

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractServiceImpl.java

@@ -941,6 +941,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
         Criteria createCriteria = example.createCriteria();
         createCriteria.andAuditStateEqualTo(AuditType.AGREE.getAuditCode());
         createCriteria.andChangingNotEqualTo("2");
+        createCriteria.andContractTypeNotEqualTo(6913);//除去中转合同
         if (contract != null) {
             // 合同编号
             if (StringUtils.isNotBlank(contract.getContractNumber())) {
@@ -970,13 +971,13 @@ public class BusinessContractServiceImpl implements BusinessContractService {
         if (contractList != null && contractList.size() > 0) {
             // 拼接  起始合同id 这里不拼接id,是因为.
             StringBuffer sb = new StringBuffer();
-            StringBuffer fyzz = new StringBuffer(); //发运中转
+            /*StringBuffer fyzz = new StringBuffer(); //发运中转
             StringBuffer dzzz = new StringBuffer(); //到站中转
-            sb.append("(");
-            fyzz.append("(");
-            dzzz.append("(");
+*/            sb.append("(");
+            /*fyzz.append("(");
+            dzzz.append("(");*/
             for (BusinessContractAuditVO businessContractV : contractList) {
-            	if(businessContractV.getCustomerId()!=null){
+            	/*if(businessContractV.getCustomerId()!=null){
             		if(businessContractV.getCustomerId().equals("7027")){ //到站中转
                     	dzzz.append("\""+businessContractV.getRootContractBid()+ "\"").append(",");
                     }else if(businessContractV.getCustomerId().equals("7028")){ //发运中转
@@ -984,20 +985,21 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                     }
             	}else{
             		sb.append("\"" + businessContractV.getRootContractBid() + "\"").append(",");
-            	}
+            	}*/
+            	sb.append("\"" + businessContractV.getRootContractBid() + "\"").append(",");
             }
             String substring = sb.substring(0, sb.length() - 1);
-            String fyzzSubstring = fyzz.substring(0, fyzz.length() - 1);
-            String dzzzSubstring = dzzz.substring(0, dzzz.length() - 1);
+            /*String fyzzSubstring = fyzz.substring(0, fyzz.length() - 1);
+            String dzzzSubstring = dzzz.substring(0, dzzz.length() - 1);*/
             sb = new StringBuffer(substring);
-            fyzz = new StringBuffer(fyzzSubstring);
-            dzzz = new StringBuffer(dzzzSubstring);
+            /*fyzz = new StringBuffer(fyzzSubstring);
+            dzzz = new StringBuffer(dzzzSubstring);*/
             sb.append(")");
-            fyzz.append(")");
-            dzzz.append(")");
+            /*fyzz.append(")");
+            dzzz.append(")");*/
             List<BusinessScedule> businessSceduleList = feignAgileService.getContractSceduleInContractId(sb.toString()); //合同
             //List<BusinessScedule> businessSceduleList = serverApi.getContractSceduleInContractId(sb.toString());
-            List<BusinessScedule> dzContractSceduleList = null ;
+          /*  List<BusinessScedule> dzContractSceduleList = null ;
             List<BusinessScedule> fyContractSceduleList = null;
             if(dzzz.indexOf(",")!=-1){
             	 dzContractSceduleList = feignAgileService.getDzContractSceduleInContractId(dzzz.toString()); //到站中转的合同
@@ -1016,7 +1018,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
             	for (BusinessScedule fyScedule : fyContractSceduleList) {
             		businessSceduleList.add(fyScedule);
             	}
-            }
+            }*/
             // 通过合同id,去出入库查询.
             if (businessSceduleList != null && businessSceduleList.size() > 0) {
                 // 循环合同list.

src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

@@ -743,6 +743,11 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         // 可以查询所有人通过的通知单
         BusinessDeliveryStorageNoticeExample example = new BusinessDeliveryStorageNoticeExample();
         Criteria createCriteria = example.createCriteria();
+        createCriteria.andAuditStateEqualTo(AuditType.AGREE.getAuditCode());
+        List<String> list = new ArrayList<String>();
+        list.add("1");
+        list.add("3");
+        createCriteria.andBillTypeIn(list);
         if (deliveryStorageNotice != null) {
             // 凭证类型.
             if (StringUtils.isNotBlank(deliveryStorageNotice.getBillType())) {
@@ -763,16 +768,21 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             if (deliveryStorageNotice.getRootContractBid() != null) {
                 createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
             }
-        }else{
-            createCriteria.andAuditStateEqualTo(AuditType.AGREE.getAuditCode());
         }
         
         // 审批通过时间倒序.
         example.setOrderByClause("agree_time desc");
         
+        PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = new PageInfo<BusinessDeliveryStorageNoticeAuditVO>();
+        // 分页.
+        if (pageNum != null && pageSize != null) {
+             PageHelper.startPage(pageNum, pageSize);
+         }
+        
         List<BusinessDeliveryStorageNoticeAuditVO> noticeList = businessDeliveryStorageNoticeMapper.selectByExampleToVO(example);
+        
         //提货单
-        if(!((deliveryStorageNotice.getRootContractBid() != null || deliveryStorageNotice.getPlanBid() != null) && noticeList.size()>0)){
+        /*if(!((deliveryStorageNotice.getRootContractBid() != null || deliveryStorageNotice.getPlanBid() != null) && noticeList.size()>0)){
         	//合同里面的进度要查看通知单  如果有RootContractBid  并且noticeList 有值 则说明是通知单表的 则不执行查询提货单的
         	BusinessLadingExample exampleLading = new BusinessLadingExample();
         	List<BusinessLading> list = ladingService.queryByExample(exampleLading); 
@@ -788,26 +798,24 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         			noticeList.add(businessAuditVO);
         		}
         	}
-        }
-      // 分页.
-        if (pageNum != null && pageSize != null) {
-             PageHelper.startPage(pageNum, pageSize);
-         }
+        }*/
+      
+        
         
-        PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = new PageInfo<BusinessDeliveryStorageNoticeAuditVO>();
         
         if (noticeList != null && noticeList.size() > 0) {
             // 拼接通知单id.
             StringBuffer sb = new StringBuffer();
-            StringBuffer thdNumber = new StringBuffer();
+            //StringBuffer thdNumber = new StringBuffer();
             sb.append("(");
-            thdNumber.append("(");
+            //thdNumber.append("(");
             for (BusinessDeliveryStorageNoticeAuditVO businessDeliveryStorageNoticeV : noticeList) {
-            	if(businessDeliveryStorageNoticeV.getBillType()!=null){//通知单
+            	/*if(businessDeliveryStorageNoticeV.getBillType()!=null){//通知单
                     sb.append("\"" + businessDeliveryStorageNoticeV.getId() + "\"").append(",");
             	}else{//提货单
             		thdNumber.append("\"" + businessDeliveryStorageNoticeV.getBillNumber() + "\"").append(",");
-            	}
+            	}*/
+            	sb.append("\"" + businessDeliveryStorageNoticeV.getId() + "\"").append(",");
             }
             
            String substring = sb.substring(0, sb.length() - 1);
@@ -818,7 +826,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
                  businessSceduleList = feignAgileService.getNoticeSceduleInNoticeId(sb.toString());
                    
              }
-            String thdNumberString = thdNumber.substring(0, thdNumber.length() - 1);
+            /*String thdNumberString = thdNumber.substring(0, thdNumber.length() - 1);
             thdNumber = new StringBuffer(thdNumberString);
             if(thdNumber.length()!=0){
             	thdNumber.append(")");
@@ -828,7 +836,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
              			businessSceduleList.add(thd);
              		}
      			}
-            }	
+            }	*/
             
            
             
@@ -929,10 +937,10 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             }
              
             pageInfo = new PageInfo<BusinessDeliveryStorageNoticeAuditVO>(noticeList);
-            if(pageInfo.getTotal()>0){ 
+           /* if(pageInfo.getTotal()>0){ 
             	pageInfo.setStartRow(pageInfo.getStartRow()+1);
             	pageInfo.setEndRow(pageInfo.getEndRow()+1);
-            }
+            }*/
         }
         return pageInfo;
     }