1

src/main/java/com/chinaitop/depot/agile/model/BusinessScedule.java

@@ -28,6 +28,8 @@ public class BusinessScedule {
     
     //完成数量
     private String sumWcsl;
+    //剩余数量
+    private String sumSysl;
     //提货单号
     private String thdh;
     
@@ -119,6 +121,11 @@ public class BusinessScedule {
     public void setCrkLx(String crkLx) {
         this.crkLx = crkLx;
     }
-    
+    public String getSumSysl() {
+		return sumSysl;
+	}
+	public void setSumSysl(String sumSysl) {
+		this.sumSysl = sumSysl;
+	}
     
 }

src/main/java/com/chinaitop/depot/business/model/vo/BusinessDeliveryStorageNoticeAuditVO.java

@@ -20,6 +20,8 @@ public class BusinessDeliveryStorageNoticeAuditVO extends BusinessDeliveryStorag
     private Integer auditId;
     // 完成数量  进度列表使用
     private String completeAmount;
+    //剩余数量
+    private String sysl;
     // 完成比例  进度列表使用
     private String completeRate;
     public String getTaskId() {
@@ -76,5 +78,11 @@ public class BusinessDeliveryStorageNoticeAuditVO extends BusinessDeliveryStorag
     public void setTaskName(String taskName) {
         this.taskName = taskName;
     }
+	public String getSysl() {
+		return sysl;
+	}
+	public void setSysl(String sysl) {
+		this.sysl = sysl;
+	}
     
 }

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

@@ -869,45 +869,16 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = new PageInfo<BusinessDeliveryStorageNoticeAuditVO>();
         // 分页.
         if (pageNum != null && pageSize != null) {
-             PageHelper.startPage(pageNum, pageSize);
-         }
+            PageHelper.startPage(pageNum, pageSize);
+        }
         
         List<BusinessDeliveryStorageNoticeAuditVO> noticeList = businessDeliveryStorageNoticeMapper.selectByExampleToVO(example);
-        
-        //提货单
-        /*if(!((deliveryStorageNotice.getRootContractBid() != null || deliveryStorageNotice.getPlanBid() != null) && noticeList.size()>0)){
-        	//合同里面的进度要查看通知单  如果有RootContractBid  并且noticeList 有值 则说明是通知单表的 则不执行查询提货单的
-        	BusinessLadingExample exampleLading = new BusinessLadingExample();
-        	List<BusinessLading> list = ladingService.queryByExample(exampleLading); 
-        	if(list.size()>0 && list!=null){
-        		for (int i = 0; i < list.size(); i++) {
-        			BusinessDeliveryStorageNoticeAuditVO businessAuditVO = new BusinessDeliveryStorageNoticeAuditVO();
-        			businessAuditVO.setId(list.get(i).getId());
-        			businessAuditVO.setBillNumber(list.get(i).getLadingNumber());
-        			businessAuditVO.setAgreeTime(list.get(i).getBillDate());
-        			BigDecimal js = new BigDecimal(list.get(i).getUnloadNumber().toString());
-        			BigDecimal zl = new BigDecimal(list.get(i).getSalesDepartment());
-        			businessAuditVO.setShipingCount(js.multiply(zl).toString());//要求数量
-        			noticeList.add(businessAuditVO);
-        		}
-        	}
-        }*/
-      
-        
-        
-        
+
         if (noticeList != null && noticeList.size() > 0) {
-            // 拼接通知单id.
+            // 拼接通知单id.去出入库查询通知单进度信息.
             StringBuffer sb = new StringBuffer();
-            //StringBuffer thdNumber = new StringBuffer();
             sb.append("(");
-            //thdNumber.append("(");
             for (BusinessDeliveryStorageNoticeAuditVO businessDeliveryStorageNoticeV : noticeList) {
-            	/*if(businessDeliveryStorageNoticeV.getBillType()!=null){//通知单
-                    sb.append("\"" + businessDeliveryStorageNoticeV.getId() + "\"").append(",");
-            	}else{//提货单
-            		thdNumber.append("\"" + businessDeliveryStorageNoticeV.getBillNumber() + "\"").append(",");
-            	}*/
             	sb.append("\"" + businessDeliveryStorageNoticeV.getId() + "\"").append(",");
             }
             
@@ -918,20 +889,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
                 sb.append(")");
                 businessSceduleList = feignAgileService.getNoticeSceduleInNoticeId(sb.toString());
             }
-            /*String thdNumberString = thdNumber.substring(0, thdNumber.length() - 1);
-            thdNumber = new StringBuffer(thdNumberString);
-            if(thdNumber.length()!=0){
-            	thdNumber.append(")");
-            	List<BusinessScedule> thdSceduleList = feignAgileService.getThdInNumber(thdNumber.toString());
-            	 for (BusinessScedule thd : thdSceduleList) {
-             		if(thd!=null){
-             			businessSceduleList.add(thd);
-             		}
-     			}
-            }	*/
-            
-           
-            
+
             // 通过通知单id,去出入库查询.
             if (businessSceduleList != null && businessSceduleList.size() > 0) {
                 // 循环通知单list.
@@ -939,90 +897,65 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
                     // 循环出入库，查询的list.
                     Boolean flag = false;
                     for (BusinessScedule businessScedule : businessSceduleList) {
-	                    if(businessScedule!=null){
-	                    		
-	                    	/*if(businessScedule.getCrkLx()==null){//提货单
-	                    		if(businessDeliveryStorageNoticeV.getBillNumber().equals(businessScedule.getThdh())){
-	                    			 flag = true;
-	                    			// 在出入库系统中，获取完成数量
-	                    			 String sumThdsl = businessScedule.getSumWcsl();
-	                                 BigDecimal sumThdslD = new BigDecimal(sumThdsl);
-	                                 // 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
-	                                 businessDeliveryStorageNoticeV.setCompleteAmount(sumThdslD.stripTrailingZeros().toPlainString());
-	                                 // 通知单要求数量.
-	                                 String demandAmount = businessDeliveryStorageNoticeV.getShipingCount();
-	                                 BigDecimal demandAmountD = new BigDecimal(demandAmount);
-	                                 
-	                                 // 除法. 已完成数量/要求数量
-	                                 BigDecimal complete = sumThdslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
-	                                 // 乘以100，得到的是百分比.
-	                                 BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
-	                                 // 赋值：设置完成百分比.
-	                                 businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
-	                    		}
-		                    		// 在出入库list中删除该数据，这样下次循环数量就会减少了.
-		                			businessSceduleList.remove(businessScedule);
-		                			// 跳出当前的出入库循环.
-		                			break;
-	                    	}else{
-	                    		
-	                    	} */   //通知单
-	                    		if (businessDeliveryStorageNoticeV.getId().toString().equals(businessScedule.getTzdId())) {
-	                    			flag = true;
-	                    			// 在出入库系统中，存在该通知单对应的出入库数据，进行计算，得出完成比率.
-	                    			String crkLx = businessScedule.getCrkLx();
-	                    			if ("1".equals(crkLx)) {
-	                    				// 入库
-	                    				// 入库数量.
-	                    				String sumRksl = businessScedule.getSumWcsl();
-	                    				BigDecimal s = new BigDecimal(1000);
-	                                    BigDecimal sumRkslss = new BigDecimal(sumRksl);
-	                       			    BigDecimal sumRkslD = sumRkslss.divide(s);
-	                       			    
-	                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
-	                    				businessDeliveryStorageNoticeV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
-	                    				// 通知单要求数量.
-	                    				String demandAmount = businessDeliveryStorageNoticeV.getShipingCount();
-	                    				BigDecimal demandAmountD = new BigDecimal(demandAmount);
-	                    				
-	                    				// 除法. 已完成数量/要求数量
-	                    				BigDecimal complete = sumRkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
-	                    				// 乘以100，得到的是百分比.
-	                    				BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
-	                    				// 赋值：设置完成百分比.
-	                    				businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
-	                    			} else if ("3".equals(crkLx)) {
-	                    				// 出库
-	                    				// 出库数量.
-	                    				String sumCksl = businessScedule.getSumWcsl();
-	                    				BigDecimal s = new BigDecimal(1000);
-	                                    BigDecimal sumCkslss = new BigDecimal(sumCksl);
-	                       			    BigDecimal sumCkslD = sumCkslss.divide(s);
-	                       			    
-	                    				
-	                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
-	                    				businessDeliveryStorageNoticeV.setCompleteAmount(sumCkslD.stripTrailingZeros().toPlainString());
-	                    				
-	                    				// 通知单要求数量.
-	                    				String demandAmount = businessDeliveryStorageNoticeV.getShipingCount();
-	                    				BigDecimal demandAmountD = new BigDecimal(demandAmount);
-	                    				
-	                    				// 除法. 已完成数量/要求数量
-	                    				BigDecimal complete = sumCkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
-	                    				// 乘以100，得到的是百分比.
-	                    				BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
-	                    				// 赋值：设置完成百分比.
-	                    				businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
-	                    			}
-	                    			// 在出入库list中删除该数据，这样下次循环数量就会减少了.
-	                    			businessSceduleList.remove(businessScedule);
-	                    			// 跳出当前的出入库循环.
-	                    			break;
-	                    		}
-	                    	//}
+	                    if (businessScedule!=null) {
+	                    	//通知单
+	                    	if (businessDeliveryStorageNoticeV.getId().toString().equals(businessScedule.getTzdId())) {
+	                    		flag = true;
+	                    		// 在出入库系统中，存在该通知单对应的出入库数据，进行计算，得出完成比率.
+	                    		String crkLx = businessScedule.getCrkLx();
+	                    		if ("1".equals(crkLx)) {
+                    				// 入库
+                    				// 入库数量.
+                    				String sumRksl = businessScedule.getSumWcsl();
+                    				BigDecimal s = new BigDecimal(1000);
+                                    BigDecimal sumRkslss = new BigDecimal(sumRksl);
+                       			    BigDecimal sumRkslD = sumRkslss.divide(s);
+                       			    
+                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
+                    				businessDeliveryStorageNoticeV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
+                    				// 通知单要求数量.
+                    				String demandAmount = businessDeliveryStorageNoticeV.getShipingCount();
+                    				BigDecimal demandAmountD = new BigDecimal(demandAmount);
+                    				
+                    				// 除法. 已完成数量/要求数量
+                    				BigDecimal complete = sumRkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
+                    				// 乘以100，得到的是百分比.
+                    				BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
+                    				// 赋值：设置完成百分比.
+                    				businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
+                    				businessDeliveryStorageNoticeV.setSysl(businessScedule.getSumSysl());
+                    			} else if ("3".equals(crkLx)) {
+                    				// 出库
+                    				// 出库数量.
+                    				String sumCksl = businessScedule.getSumWcsl();
+                    				BigDecimal s = new BigDecimal(1000);
+                                    BigDecimal sumCkslss = new BigDecimal(sumCksl);
+                       			    BigDecimal sumCkslD = sumCkslss.divide(s);
+                       			    
+                    				
+                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
+                    				businessDeliveryStorageNoticeV.setCompleteAmount(sumCkslD.stripTrailingZeros().toPlainString());
+                    				
+                    				// 通知单要求数量.
+                    				String demandAmount = businessDeliveryStorageNoticeV.getShipingCount();
+                    				BigDecimal demandAmountD = new BigDecimal(demandAmount);
+                    				
+                    				// 除法. 已完成数量/要求数量
+                    				BigDecimal complete = sumCkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
+                    				// 乘以100，得到的是百分比.
+                    				BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
+                    				// 赋值：设置完成百分比.
+                    				businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
+                    				businessDeliveryStorageNoticeV.setSysl(businessScedule.getSumSysl());
+                    			}
+                    			// 在出入库list中删除该数据，这样下次循环数量就会减少了.
+                    			businessSceduleList.remove(businessScedule);
+                    			// 跳出当前的出入库循环.
+                    			break;
+                    		}
 	                    }
                    }
-                    if (!flag) {
+                   if (!flag) {
                         // 进行到这里，说明出入库系统中，不存在该通知单对应的出入库数据. 设置完成数量，和完成比例为0.
                         businessDeliveryStorageNoticeV.setCompleteAmount("0");
                         businessDeliveryStorageNoticeV.setCompleteRate("0");
@@ -1033,14 +966,11 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
                 for (BusinessDeliveryStorageNoticeAuditVO businessDeliveryStorageNoticeV : noticeList) {
                     businessDeliveryStorageNoticeV.setCompleteAmount("0");
                     businessDeliveryStorageNoticeV.setCompleteRate("0");
+                    businessDeliveryStorageNoticeV.setSysl("0");
                 }
             }
              
             pageInfo = new PageInfo<BusinessDeliveryStorageNoticeAuditVO>(noticeList);
-           /* if(pageInfo.getTotal()>0){ 
-            	pageInfo.setStartRow(pageInfo.getStartRow()+1);
-            	pageInfo.setEndRow(pageInfo.getEndRow()+1);
-            }*/
         }
         return pageInfo;
     }