添加新粮情分析功能

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.xml

@@ -1171,17 +1171,17 @@
     cmz.nrhwID,<!--拟入货位-->
     sum(cpz.xzklhjz) as xzklhjz<!--入库数量-->
     FROM
-    depot_shanxi.business_plan plan
-    LEFT JOIN depot_shanxi.business_store_ware_detail detail ON plan.id = detail.zid
-    LEFT JOIN depot_shanxi.business_contract contract ON plan.plan_number = contract.plan_number
+    depot.business_plan plan
+    LEFT JOIN depot.business_store_ware_detail detail ON plan.id = detail.zid
+    LEFT JOIN depot.business_contract contract ON plan.plan_number = contract.plan_number
     LEFT JOIN (
         SELECT
         notice.shiping_count,
         notice.contract,
         notice.bill_number
         FROM
-            depot_shanxi.business_delivery_storage_notice notice
-        LEFT JOIN depot_shanxi.business_store_ware_detail detail ON notice.id = detail.zid
+            depot.business_delivery_storage_notice notice
+        LEFT JOIN depot.business_store_ware_detail detail ON notice.id = detail.zid
         <where>
           detail.type = 'notice'
           <if test="orgId != null and orgId != ''">
@@ -1221,17 +1221,17 @@
     ckcpz.ychwID nrhwID,
     sum(ckcmz.klhjz) AS xzklhjz
     FROM
-    depot_shanxi.business_plan plan
-    LEFT JOIN depot_shanxi.business_store_ware_detail detail ON plan.id = detail.zid
-    LEFT JOIN depot_shanxi.business_contract contract ON plan.plan_number = contract.plan_number
+    depot.business_plan plan
+    LEFT JOIN depot.business_store_ware_detail detail ON plan.id = detail.zid
+    LEFT JOIN depot.business_contract contract ON plan.plan_number = contract.plan_number
     LEFT JOIN (
         SELECT
         notice.shiping_count,
         notice.contract,
         notice.bill_number
         FROM
-            depot_shanxi.business_delivery_storage_notice notice
-        LEFT JOIN depot_shanxi.business_store_ware_detail detail ON notice.id = detail.zid
+            depot.business_delivery_storage_notice notice
+        LEFT JOIN depot.business_store_ware_detail detail ON notice.id = detail.zid
         <where>
           detail.type = 'notice'
           <if test="orgId != null and orgId != ''">

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

@@ -1028,33 +1028,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                     	//根据主表获取仓房货位信息
                         List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(businessContractV.getId(), StoreWareType.contract.getValue());
                         BigDecimal wcsl = new BigDecimal("0") ;
-                    	BigDecimal sysl = new BigDecimal("0") ;
                     	List<BusinessScedule> businessSceduleSyList = new ArrayList<BusinessScedule>();
-                        for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
-                        	//根据单位仓房货位品种性质 获取损益的数量
-                        	Map<String, Object> map = new HashMap<String, Object>();
-                        	map.put("orgId", businessContractV.getOrgId());
-                        	map.put("grainKind", businessStoreWareDetail.getGrainKind());
-                    		map.put("grainAttribute", businessStoreWareDetail.getGrainAttribute());
-                        	if(businessStoreWareDetail.getHouseId()!=null && !businessStoreWareDetail.getHouseId().equals("0")){//粮食
-                        		map.put("houseId", businessStoreWareDetail.getHouseId());
-                        		map.put("warehouseId", businessStoreWareDetail.getWarehouseId());
-                        	}else if(businessStoreWareDetail.getHouseId().equals("0")){//油
-                        		map.put("houseId", businessStoreWareDetail.getHouseName());
-                        	}
-                        	//区分出库入库--损【1】就出库，益【0】就是入库
-                            if ("1".equals(businessScedule.getCrkLx())) {//入库
-                                map.put("lossProfit", 0);
-                            }else{
-                                map.put("lossProfit", 1);
-                            }
-                            businessSceduleSyList = businessSceduleService.getSyCount(map);
-                        	
-                        	if(businessSceduleSyList.size()>0){
-                        		 sysl = new BigDecimal(businessSceduleSyList.get(0).getSysl());
-                        	}
-                        	break;
-                        }
                         	if (businessContractV.getId().toString().equals(businessScedule.getHtId())) {
                                 flag = true;
                                 // 在出入库系统中，存在该合同对应的出入库数据，进行计算，得出完成比率.
@@ -1065,22 +1039,9 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                                     String sumRksl = businessScedule.getSumWcsl();
                                     BigDecimal sumRkslD = new BigDecimal(sumRksl);
                                     // 出入库中的出库数量单位是公斤，合同中是吨，所以出入库数量要除以1000.
-                                    //sumRkslD = sumRkslD.divide(new BigDecimal("1000"), 4, BigDecimal.ROUND_HALF_DOWN);
-                                    
-                                    if(businessSceduleSyList.size()>0){
-                                   	 if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-                                      	  wcsl = sumRkslD.add(sysl);
-                                      	  businessContractV.setRemainingAmount(sumRkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
-                                       }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-                                      	 wcsl = sumRkslD.subtract(sysl);
-                                      	 businessContractV.setRemainingAmount(sumRkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-                                       }
-                                    }else{
-                                   	    wcsl = sumRkslD;
-                                   	    businessContractV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-                                    }
-                                    
-                                    
+                                    wcsl = sumRkslD;
+                                    businessContractV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
+
                                     // 赋值： 设置完成数量. stripTrailingZeros() 去除结尾的0
                                     businessContractV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());
                                     
@@ -1100,22 +1061,9 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                                     String sumCksl = businessScedule.getSumWcsl();
                                     BigDecimal sumCkslD = new BigDecimal(sumCksl);
                                     // 出入库中的出库数量单位是公斤，合同中是吨，所以出入库数量要除以1000.
-                                    //sumCkslD = sumCkslD.divide(new BigDecimal("1000"), 4, BigDecimal.ROUND_HALF_DOWN);
-                                    
-                                    if(businessSceduleSyList.size()>0){
-                                   	 if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-                                       	    wcsl = sumCkslD.add(sysl);
-                                       	    businessContractV.setRemainingAmount(sumCkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
-                                         }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-                                       	    wcsl = sumCkslD.subtract(sysl);
-                                       	    businessContractV.setRemainingAmount(sumCkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-                                         }
-                                    }else{
-                                   	   wcsl = sumCkslD;
-                                   	   businessContractV.setRemainingAmount(sumCkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-                                    }
-                                    
-                                    
+                                   wcsl = sumCkslD;
+                                   businessContractV.setRemainingAmount(sumCkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
+
                                     // 赋值：设置完成数量 . stripTrailingZeros() 去除结尾的0
                                     businessContractV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());
                                     

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

@@ -908,32 +908,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 	                    			//根据主表获取仓房货位信息
 	                                List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(businessDeliveryStorageNoticeV.getId(), StoreWareType.notice.getValue());
 	                                BigDecimal wcsl = new BigDecimal("0") ;
-	                            	BigDecimal sysl = new BigDecimal("0") ;
 	                            	List<BusinessScedule> businessSceduleSyList = new ArrayList<BusinessScedule>();
-	                                for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
-	                                	//根据单位仓房货位品种性质 获取损益的数量
-	                                	Map<String, Object> map = new HashMap<String, Object>();
-	                                	map.put("orgId", businessDeliveryStorageNoticeV.getOrgId());
-	                                	map.put("grainKind", businessStoreWareDetail.getGrainKind());
-	                            		map.put("grainAttribute", businessStoreWareDetail.getGrainAttribute());
-	                                	if(businessStoreWareDetail.getHouseId()!=null && !businessStoreWareDetail.getHouseId().equals("0")){//粮食
-	                                		map.put("houseId", businessStoreWareDetail.getHouseId());
-	                                		map.put("warehouseId", businessStoreWareDetail.getWarehouseId());
-	                                	}else if(businessStoreWareDetail.getHouseId().equals("0")){//油
-	                                		map.put("houseId", businessStoreWareDetail.getHouseName());
-	                                	}
-                                        //区分出库入库--损【1】就出库，益【0】就是入库
-                                        if ("1".equals(businessScedule.getCrkLx())) {//入库
-                                            map.put("lossProfit", 0);
-                                        }else{
-                                            map.put("lossProfit", 1);
-                                        }
-	                                	 businessSceduleSyList = businessSceduleService.getSyCount(map);
-	                                	if(businessSceduleSyList.size()>0){
-	                                		 sysl = new BigDecimal(businessSceduleSyList.get(0).getSysl());
-	                                	}
-	                                	break;
-	                                }	
 	                                	// 在出入库系统中，存在该通知单对应的出入库数据，进行计算，得出完成比率.
 		                    			String crkLx = businessScedule.getCrkLx();
 		                    			if ("1".equals(crkLx)) {
@@ -942,19 +917,9 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 		                    				String sumRksl = businessScedule.getSumWcsl();
 		                    				BigDecimal sumRkslD = new BigDecimal(sumRksl);
 		                    				
-		                    				if(businessSceduleSyList.size()>0){
-		                                    	 if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-			                                       	  wcsl = sumRkslD.add(sysl);
-			                                       	  businessDeliveryStorageNoticeV.setRemainingAmount(sumRkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
-		                                         }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-			                                       	 wcsl = sumRkslD.subtract(sysl);
-			                                       	 businessDeliveryStorageNoticeV.setRemainingAmount(sumRkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-		                                         }
-		                                     }else{
-			                                    	 wcsl = sumRkslD;
-			                                    	 businessDeliveryStorageNoticeV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-		                                     }
-		                    				
+                                         wcsl = sumRkslD;
+                                         businessDeliveryStorageNoticeV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
+
 		                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
 		                    				businessDeliveryStorageNoticeV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());
 		                    				// 通知单要求数量.
@@ -973,20 +938,9 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 		                    				String sumCksl = businessScedule.getSumWcsl();
 		                    				BigDecimal sumCkslD = new BigDecimal(sumCksl);
 		                    				
-		                    				if(businessSceduleSyList.size()>0){
-		                                    	 if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-		                                        	    wcsl = sumCkslD.add(sysl);
-				                                       	businessDeliveryStorageNoticeV.setRemainingAmount(sumCkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
+                                         wcsl = sumCkslD;
+                                         businessDeliveryStorageNoticeV.setRemainingAmount(sumCkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
 
-		                                          }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-		                                        	    wcsl = sumCkslD.subtract(sysl);
-				                                       	businessDeliveryStorageNoticeV.setRemainingAmount(sumCkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-		                                          }
-		                                     }else{
-		                                    	 wcsl = sumCkslD;
-		                                    	 businessDeliveryStorageNoticeV.setRemainingAmount(sumCkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-		                                     }
-		                    				
 		                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
 		                    				businessDeliveryStorageNoticeV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());
 		                    				

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

@@ -623,37 +623,11 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                         if (businessPlanV.getId().toString().equals(businessScedule.getJhId())) {
                             flag = true;
                             // 在出入库系统中，存在该计划对应的出入库数据，进行计算，得出完成比率.
-                            
-                           
+
                         	//根据主表获取仓房货位信息
                             List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(businessPlanV.getId(), StoreWareType.plan.getValue());
                             BigDecimal wcsl = new BigDecimal("0") ;
-                        	BigDecimal sysl = new BigDecimal("0") ;//损益数量
                         	List<BusinessScedule> businessSceduleSyList = new ArrayList<BusinessScedule>();
-                            for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
-                            	//根据单位仓房货位品种性质 获取损益的数量
-                            	Map<String, Object> map = new HashMap<String, Object>();
-                            	map.put("orgId", businessPlanV.getOrgId());
-                            	map.put("grainKind", businessStoreWareDetail.getGrainKind());
-                        		map.put("grainAttribute", businessStoreWareDetail.getGrainAttribute());
-                            	if(businessStoreWareDetail.getHouseId()!=null && !businessStoreWareDetail.getHouseId().equals("0")){//粮食
-                            		map.put("houseId", businessStoreWareDetail.getHouseId());
-                            		map.put("warehouseId", businessStoreWareDetail.getWarehouseId());
-                            	}else if(businessStoreWareDetail.getHouseId().equals("0")){//油
-                            		map.put("houseId", businessStoreWareDetail.getHouseName());
-                            	}
-                                //区分出库入库--损【1】就出库，益【0】就是入库
-                                if ("1".equals(businessScedule.getCrkLx())) {//入库
-                                    map.put("lossProfit", 0);
-                                }else{
-                                    map.put("lossProfit", 1);
-                                }
-                            	 businessSceduleSyList = businessSceduleService.getSyCount(map);
-                            	if(businessSceduleSyList.size()>0){
-                            		 sysl = new BigDecimal(businessSceduleSyList.get(0).getSysl());
-                            	}
-                            	break;
-                            }	
                             	 String crkLx = businessScedule.getCrkLx();
                             if (ParameterUtil.isequal("3156",businessPlanV.getExecuteType()) || ParameterUtil.isequal("7121",businessPlanV.getExecuteType())) {
                                 // 入库数量.
@@ -665,18 +639,8 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                                 BigDecimal sumCkslD = new BigDecimal(sumCksl);
 
                                 sumRkslD.add(sumCkslD);
-                                if(businessSceduleSyList.size()>0){
-                                    if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-                                        wcsl = sumRkslD.add(sysl);
-                                        businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
-                                    }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-                                        wcsl = sumRkslD.subtract(sysl);
-                                        businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-                                    }
-                                }else{
-                                    wcsl = sumRkslD;
-                                    businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-                                }
+                                wcsl = sumRkslD;
+                                businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
 
                                 // 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
                                 businessPlanV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());
@@ -701,19 +665,9 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                                      String sumRksl = businessScedule.getSumWcsl();
                                      BigDecimal sumRkslD = new BigDecimal(sumRksl);
                                      
-                                     if(businessSceduleSyList.size()>0){
-                                    	 if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-                                       	  wcsl = sumRkslD.add(sysl);
-                                       	  businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
-                                        }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-                                       	  wcsl = sumRkslD.subtract(sysl);
-                                     	  businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-                                        }
-                                     }else{
-                                    	 wcsl = sumRkslD;
-                                    	 businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-                                     }
-                                     
+                                     wcsl = sumRkslD;
+                                     businessPlanV.setRemainingAmount(sumRkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
+
                                      
                                      // 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
                                      businessPlanV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());
@@ -734,21 +688,9 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                                      String sumCksl = businessScedule.getSumWcsl();
                                      BigDecimal sumCkslD = new BigDecimal(sumCksl);
                                      
-                                     if(businessSceduleSyList.size()>0){
-                                    	 if(businessSceduleSyList.get(0).getSycode().equals("1")){ //1是减少 0是增加
-                                        	    wcsl = sumCkslD.add(sysl);
-                                        	    businessPlanV.setRemainingAmount(sumCkslD.subtract(wcsl).add(sysl).stripTrailingZeros().toPlainString());
-                                          }else if(businessSceduleSyList.get(0).getSycode().equals("0")){
-                                        	    wcsl = sumCkslD.subtract(sysl);
-                                        	    businessPlanV.setRemainingAmount(sumCkslD.subtract(wcsl).subtract(sysl).stripTrailingZeros().toPlainString());
-                                          }
-                                     }else{
-                                    	 wcsl = sumCkslD;
-                                    	 businessPlanV.setRemainingAmount(sumCkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
-                                     }
-                                     
-                                     
-                                     
+                                     wcsl = sumCkslD;
+                                     businessPlanV.setRemainingAmount(sumCkslD.subtract(wcsl).stripTrailingZeros().toPlainString());
+
                                      // 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
                                      businessPlanV.setCompleteAmount(wcsl.stripTrailingZeros().toPlainString());