通知单变更查看获取最新的剩余数量、已审批通知单是变更后的新通知单

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessDeliveryStorageNoticeAuditController.java

@@ -397,8 +397,159 @@ public class BusinessDeliveryStorageNoticeAuditController {
         modelMap.put("changeDetailList", changeDetailList);
         
         // 仓号货位号数量质量标准.
-        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.notice.getValue());
+       /* List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.notice.getValue());
+        modelMap.put("storeWareDetailList", storeWareDetailList);*/
+        
+     // 仓号货位号数量质量标准.
+        List<BusinessStoreWareDetail> storeWareDetailList = null;
+        List<BusinessStoreWareDetail> list = null;
+        List<Map<String, Object>> map = null;
+        List<Map<String, Object>> stopMap = null;
+        Map<String, Object> param_map = new HashMap<String, Object>();
+        if(deliveryStorageNotice.getPlanBid()!=null && deliveryStorageNotice.getContractBid()==null){//只引用计划 没引用合同 算计划剩余数量
+        	// 查询该条通知单引的计划的剩余数量
+        	 list= businessStoreWareDetailService.getByZidAndType(deliveryStorageNotice.getPlanBid(), StoreWareType.plan.getValue());
+        	//计算每条明细所对应的计划的剩余数量
+        	param_map.put("plan_id", deliveryStorageNotice.getPlanBid());
+        	if(list.size()>0){
+        		if(list.get(0).getHouseId() == 0 && list.get(0).getWarehouseId() == null){//油
+        			 map = businessStoreWareDetailService.selectPlanOilUseCount(param_map);
+        		}else{
+        			 map = businessStoreWareDetailService.selectPlanUseCount(param_map);
+
+        		}
+        	}
+        	 stopMap = businessStoreWareDetailService.selectPlanUseCountIsStop(param_map);
+        }else if(deliveryStorageNotice.getContractBid()!=null){//引用了合同 无论用不用计划 都算的是合同的剩余数量
+        	list = businessStoreWareDetailService.getByZidAndType(deliveryStorageNotice.getContractBid(), StoreWareType.contract.getValue());
+			param_map.put("contract_id", deliveryStorageNotice.getContractBid());
+			if(list.size()>0){
+        		if(list.get(0).getHouseId() == 0 && list.get(0).getWarehouseId() == null){//油
+        			 map = businessStoreWareDetailService.selectContractOilUseCount(param_map);
+        		}else{
+        			 map = businessStoreWareDetailService.selectContractUseCount(param_map);
+        		}
+        	}
+			stopMap = businessStoreWareDetailService.selectContractUseCountIsStop(param_map);
+        }
+            
+            
+            BusinessStoreWareDetail obj = null;
+            double sysl = 0d;
+            double sum_use_num = 0d; //已使用总量
+            double plan_sum_num = 0d; //原计划数量
+            double stop_use_num = 0d; //终止的通知单走完出入库的计划数量
+            for (int i = 0; i < list.size(); i++) {
+            	obj = list.get(i);
+            	for (Map<String, Object> m : map) {
+            		if(obj.getHouseId() == 0 && obj.getWarehouseId() == null){//油料
+            			if(stopMap.size()>0){
+            				for (Map<String, Object> m1 : stopMap) {
+								if(m1.get("chID").equals(m.get("house_name").toString())){
+									stop_use_num = Double.parseDouble(m1.get("wcsl")+"");
+									break;
+								}
+							}
+            			}
+            			if (m.get("house_name").equals(obj.getHouseName())) {
+                			if (!"".equals(m.get("in_count")) && null != m.get("in_count") && !"".equals(obj.getInCount()) && null != obj.getInCount()) {
+                				plan_sum_num = Double.parseDouble(obj.getInCount());
+                				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num - stop_use_num;
+                					obj.setRemainingNumber(sysl+""); //页面上明细列表的数量
+                					if (sysl == 0) {
+                						obj.setRemainingNumber("0");
+                					}
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num + stop_use_num - plan_sum_num;
+                					obj.setRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                			if (!"".equals(m.get("out_count")) && null != m.get("out_count") && !"".equals(obj.getOutCount()) && null != obj.getOutCount()) {
+                				plan_sum_num = Double.parseDouble(obj.getOutCount());
+                				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num - stop_use_num;
+                					obj.setOutRemainingNumber(""+sysl);
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num + stop_use_num - plan_sum_num;
+                					obj.setOutRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                		}
+            		}else{
+            			if(stopMap.size()>0){
+                			for (Map<String, Object> m1 : stopMap) {
+								if(m1.get("chID").equals(m.get("house_id").toString()) && m1.get("hwID").equals(m.get("warehouse_id").toString())){
+										stop_use_num = Double.parseDouble(m1.get("wcsl")+"");
+										break;
+								}
+							}
+                		}
+            			if (m.get("house_id").equals(obj.getHouseId()) && m.get("warehouse_id").equals(obj.getWarehouseId())) {
+                			if (!"".equals(m.get("in_count")) && null != m.get("in_count") && !"".equals(obj.getInCount()) && null != obj.getInCount()) {
+                				plan_sum_num = Double.parseDouble(obj.getInCount());
+                				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num - stop_use_num;
+                					obj.setRemainingNumber(sysl+""); //页面上明细列表的数量
+                					if (sysl == 0) {
+                						obj.setRemainingNumber("0");
+                					}
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num + stop_use_num - plan_sum_num;
+                					obj.setRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                			if (!"".equals(m.get("out_count")) && null != m.get("out_count") && !"".equals(obj.getOutCount()) && null != obj.getOutCount()) {
+                				plan_sum_num = Double.parseDouble(obj.getOutCount());
+                				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num - stop_use_num;
+                					obj.setOutRemainingNumber(""+sysl);
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num + stop_use_num - plan_sum_num;
+                					obj.setOutRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                		}
+            		}
+            		
+            	}
+            }
+
+        	// 该条通知单下的明细
+	        storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.notice.getValue());
+	        for (BusinessStoreWareDetail businessPlanDetail : list) {
+	        	 for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
+	        		 if(businessPlanDetail.getHouseId()==0 && businessPlanDetail.getWarehouseName()!=null){//油
+	        			 if(businessPlanDetail.getHouseName().equals(businessStoreWareDetail.getHouseName())){
+	        				 if(businessPlanDetail.getRemainingNumber()!=null){
+	      							businessStoreWareDetail.setRemainingNumber(businessPlanDetail.getRemainingNumber());
+	      						}
+	      						if(businessPlanDetail.getOutRemainingNumber()!=null){
+	      							businessStoreWareDetail.setOutRemainingNumber(businessPlanDetail.getOutRemainingNumber());
+	      						}
+	        			 }
+	        		 }else{
+	        			 if(businessPlanDetail.getHouseId().equals(businessStoreWareDetail.getHouseId()) &&
+	      					   businessPlanDetail.getWarehouseId().equals(businessStoreWareDetail.getWarehouseId())){
+	      					    
+	      						if(businessPlanDetail.getRemainingNumber()!=null){
+	      							businessStoreWareDetail.setRemainingNumber(businessPlanDetail.getRemainingNumber());
+	      						}
+	      						if(businessPlanDetail.getOutRemainingNumber()!=null){
+	      							businessStoreWareDetail.setOutRemainingNumber(businessPlanDetail.getOutRemainingNumber());
+	      						}
+	      						
+	      					}
+	        		 }
+				}
+			}
+        
         modelMap.put("storeWareDetailList", storeWareDetailList);
+        
         return modelMap;
     }
 }

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

@@ -1095,21 +1095,23 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             
            // 判断是否是通知单变更.
             if (StringUtils.isNotBlank(noticeType) && "change".equals(noticeType)) {
-                // 合同变更标志 为  1，也就是合同变更数据.
-                //contract.setChangeRecordFlag("1");
+            	// 通知单变更标志为1，也就是通知单变更数据.
                 createCriteria.andChangeRecordFlagEqualTo("1");
                 createCriteria1.andChangeRecordFlagEqualTo("1");
                 // 变更状态为没有被变更成功. changing：0未变更； 1变更中； 2已变更；
                 // 注：如果一条合同变更多次，只会显示最新一次的变更.
                 createCriteria.andChangingNotEqualTo("2");
                 createCriteria1.andChangingNotEqualTo("2");
-            }else{ //未变更的合同(合同申请)
-            	createCriteria.andChangeRecordFlagEqualTo("0");
-            	createCriteria1.andChangeRecordFlagEqualTo("0");
+            }else{ 
+	             /*//0 不是变更的数据 1是变更的数据
+	             createCriteria.andChangeRecordFlagEqualTo("0");
+	             createCriteria1.andChangeRecordFlagEqualTo("0");*/
+              // 变更状态为没有被变更0. 1是变更 2 变更成功
+                createCriteria.andChangingEqualTo("0");
+                createCriteria1.andChangingEqualTo("0");
             }
         }
-        // 变更状态为没有被变更.
-        createCriteria.andChangingEqualTo("0");
+        //除去中转的
         createCriteria.andBillTypeNotEqualTo("2");
         createCriteria1.andBillTypeNotEqualTo("2");
         example.or(createCriteria1);