1

src/main/java/com/chinaitop/depot/business/controller/BusinessMergeNoticeController.java

@@ -107,7 +107,7 @@ public class BusinessMergeNoticeController {
 		}
         return pageInfo;
     }
-	
+
 	@RequestMapping(value="/findByTzdidQueryList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
 	@ApiOperation(value="按照通知单ID查询通知单合并记录", notes = "")
 	@ApiImplicitParams({

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

@@ -329,12 +329,13 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                     					businessNoticeReceive.setGrainAnnual(Integer.parseInt(scnf));//收获年度
                     				}
                                 }
+                                businessNoticeReceive.setIsSheet(1);//入库类型的只有在市级企业端提交了入库验收申请，才会生成入库性质转变单
                                 //入库兜底类型的不需要审批性质转变单
-                                if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("3")) {
+                                /*if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("3")) {
                                 	businessNoticeReceive.setIsSheet(1);
                                 } else {
                                 	businessNoticeReceive.setIsSheet(0);
-                                }
+                                }*/
                                 //businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
                 				businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));//粮食性质转变单单号
                 				//SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
@@ -352,7 +353,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                 				//businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
                 				String ytzdid = jsonObject.getString("ytzdid");
                 				if (StringUtils.isNotBlank(ytzdid)) {//有值的话就代表是变更的通知单，不需要生成性质转变单
-                					businessNoticeReceive.setIsSheet(1);//这是属于通知单变更，不需要重新生成性质转变单
+                					//businessNoticeReceive.setIsSheet(1);//这是属于通知单变更，不需要重新生成性质转变单
                 					businessNoticeReceive.setYtzdid(ytzdid);
                 				}
                 				businessNoticeReceiveMapper.insert(businessNoticeReceive);

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -1,14 +1,14 @@
 package com.chinaitop.depot.pushs.service.impl;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
-import com.chinaitop.depot.business.mapper.BusinessStoreWareDetailMapper;
-import com.chinaitop.depot.business.model.*;
-import com.chinaitop.depot.business.service.ReceiveNoticeService;
-import com.chinaitop.depot.utils.ParameterUtil;
 import org.apache.commons.lang.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,9 +19,21 @@ import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.business.mapper.BusinessContractMapper;
 import com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper;
 import com.chinaitop.depot.business.mapper.BusinessLadingMapper;
+import com.chinaitop.depot.business.mapper.BusinessMergeNoticeMapper;
 import com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper;
+import com.chinaitop.depot.business.mapper.BusinessStoreWareDetailMapper;
+import com.chinaitop.depot.business.model.BusinessContract;
+import com.chinaitop.depot.business.model.BusinessContractExample;
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice;
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample;
+import com.chinaitop.depot.business.model.BusinessMergeNoticeDetail;
+import com.chinaitop.depot.business.model.BusinessNoticeReceive;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetailExample;
+import com.chinaitop.depot.business.service.ReceiveNoticeService;
 import com.chinaitop.depot.pushs.service.PushsService;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.utils.ParameterUtil;
 
 @Service
 public class PushServiceImpl implements PushsService{
@@ -41,6 +53,8 @@ public class PushServiceImpl implements PushsService{
 	private ReceiveNoticeService receiveNoticeService;
 	@Resource
 	private BusinessNoticeReceiveMapper receiveNoticeMapper;
+	@Resource
+	private BusinessMergeNoticeMapper businessMergeNoticeMapper;
 
 
 
@@ -217,19 +231,136 @@ public class PushServiceImpl implements PushsService{
 		
 		List<Map<String,Object>> mainList1 =businessDeliveryStorageNoticeMapper.getNoticeData(mapCondition1);
 		//再根据主数据id查出相关的从数据插入
-				for (Map<String,Object> mains : mainList1) {
-					//单位转化为公斤
-					BigDecimal bignum = new BigDecimal(1000);
-					//数量转化为公斤
-					if(mains.get("shiping_count")!=null && !mains.get("shiping_count").equals("")){
-						BigDecimal count = new BigDecimal(mains.get("shiping_count").toString());
-						mains.put("shiping_count", count.multiply(bignum).toString());
+		for (Map<String,Object> mains : mainList1) {
+			//单位转化为公斤
+			BigDecimal bignum = new BigDecimal(1000);
+			//数量转化为公斤
+			if(mains.get("shiping_count")!=null && !mains.get("shiping_count").equals("")){
+				BigDecimal count = new BigDecimal(mains.get("shiping_count").toString());
+				mains.put("shiping_count", count.multiply(bignum).toString());
+			}
+		}
+
+		//查所有合并过的数据
+		BusinessMergeNoticeDetail detailObj = new BusinessMergeNoticeDetail();
+		detailObj.setOrgId(Integer.parseInt(orgId));
+
+		List<Map<String,Object>> mainList2 = new ArrayList<>();
+		List<BusinessMergeNoticeDetail> hbtzdList = businessMergeNoticeMapper.findByZidDetailList(detailObj);
+		if (null != hbtzdList && hbtzdList.size() > 0) {
+			List<Integer> tzdids = new ArrayList<>();
+			for (BusinessMergeNoticeDetail detail : hbtzdList) {
+				tzdids.add(Integer.parseInt(detail.getTzdid()));
+			}
+			Map<String,Object> mapCondition2 = new HashMap<String, Object>();
+			mapCondition2.put("ids", tzdids);
+			
+			mainList2 = businessDeliveryStorageNoticeMapper.getNoticeData(mapCondition2);
+			//再根据主数据id查出相关的从数据插入
+			for (Map<String,Object> mains : mainList2) {
+				BusinessStoreWareDetailExample businessStoreWareDetailExample = new BusinessStoreWareDetailExample();
+				BusinessStoreWareDetailExample.Criteria criteria = businessStoreWareDetailExample.createCriteria();
+				criteria.andZidEqualTo(Integer.valueOf(mains.get("id").toString()));
+				criteria.andTypeEqualTo("notice");//默认查询通知单类型数据
+				List<BusinessStoreWareDetail> json = businessStoreWareDetailMapper.selectByExample(businessStoreWareDetailExample);
+				//单位转化为公斤
+				BigDecimal bignum = new BigDecimal(1000);
+				if(json.size()>0 && json!=null){
+					if(mains.get("bill_type").toString().equals("2")){
+						for (int i = 0; i < json.size(); i++) {
+							if(null != json.get(i).getInCount() && !json.get(i).getInCount().equals("")){
+								BigDecimal bignum1 = new BigDecimal(json.get(i).getInCount()); 
+								BigDecimal inCount = bignum1.multiply(bignum);
+								json.get(i).setInCount(inCount.toString());
+							}
+							if(null != json.get(i).getOutCount() && !json.get(i).getOutCount().equals("")){
+								BigDecimal bignum2 = new BigDecimal(json.get(i).getOutCount()); 
+								BigDecimal outCount = bignum2.multiply(bignum);
+								json.get(i).setOutCount(outCount.toString());
+							}
+						}
+					}else{
+						for (int i = 0; i < json.size(); i++) {
+							if(null != json.get(i).getInCount() && !json.get(i).getInCount().equals("") && !json.get(i).getInPrice().equals("") && null != json.get(i).getInPrice()){
+								BigDecimal bignum1 = new BigDecimal(json.get(i).getInCount()); 
+								BigDecimal biginprice1 = new BigDecimal(json.get(i).getInPrice()); 
+								BigDecimal inCount = bignum1.multiply(bignum);
+								//BigDecimal inDetailTotalPrice = inCount.multiply(biginprice1);
+								BigDecimal inPrice = biginprice1.divide(bignum);
+								json.get(i).setInCount(inCount.toString());
+								json.get(i).setInPrice(inPrice.toString());
+							}
+							if(null != json.get(i).getOutCount() && !json.get(i).getOutCount().equals("") && null != json.get(i).getOutPrice() &&  !json.get(i).getOutPrice().equals("")){
+								BigDecimal bignum2 = new BigDecimal(json.get(i).getOutCount()); 
+								BigDecimal biginprice2 = new BigDecimal(json.get(i).getOutPrice()); 
+								BigDecimal outCount = bignum2.multiply(bignum);
+								//BigDecimal outDetailTotalPrice = outCount.multiply(biginprice2);
+								BigDecimal outPrice = biginprice2.divide(bignum);
+								json.get(i).setOutCount(outCount.toString());
+								json.get(i).setOutPrice(outPrice.toString());
+							}
+						}
 					}
+
+					//判断出库期限 储备粮通知单
+					if(mains.containsKey("create_unit") && mains.get("bill_type").toString().equals("3")){
+						if(mains.get("create_unit").toString().equals("1")){ //取储备粮的通知单
+							for (int j = 0; j < json.size(); j++) {
+								if(json.get(j).getJstzdId().length()>0 && json.get(j).getJstzdId()!=null){
+									BusinessNoticeReceive noticeReceive = receiveNoticeMapper.selectByPrimaryKey(Integer.valueOf(json.get(j).getJstzdId()));
+									json.get(j).setOutboundExpirationDate(noticeReceive.getOutgoingPeriod());
+								}
+							}
+						}
+					}
+					
 				}
-		
+
+				mains.put("fromData",json);//从表数据以json形式插入主表数据
+				
+				//数量转化为公斤
+				if(mains.get("shiping_count")!=null && !mains.get("shiping_count").equals("")){
+					BigDecimal count = new BigDecimal(mains.get("shiping_count").toString());
+					mains.put("shiping_count", count.multiply(bignum).toString());
+				}
+
+				//处理储备粮中的通知单 
+				if(null != mains.get("create_unit")){
+					if(mains.get("create_unit").equals(1)){
+						//传字段 计划文件号 和摘要 用于分仓保管账
+						for (BusinessStoreWareDetail businessStoreWareDetail : json) {
+							BusinessNoticeReceive businessNoticeReceive =new BusinessNoticeReceive();
+							businessNoticeReceive.setHouseId(businessStoreWareDetail.getHouseId());
+							businessNoticeReceive.setWareHouseId(businessStoreWareDetail.getWareHouseId());
+							businessNoticeReceive.setGrainKind(businessStoreWareDetail.getGrainKind());
+							businessNoticeReceive.setGrainAttribute(businessStoreWareDetail.getGrainAttribute());
+							businessNoticeReceive.setOrgId(businessStoreWareDetail.getOrgId());
+							List<BusinessNoticeReceive> noticeRecevieList = receiveNoticeService.queryByExample(null, null, businessNoticeReceive, null,null);
+							if(null != noticeRecevieList && noticeRecevieList.size()>0){
+								String jhwjh = noticeRecevieList.get(0).getNoticeNumber();
+								String zy = noticeRecevieList.get(0).getYwtype();
+								if(("1").equals(zy)){ //1收储 2 销售 3轮换
+									zy = "收储";
+								}else if(("2").equals(zy)){
+									zy = "销售";
+								}else if(("3").equals(zy)){
+									zy = "轮换";
+								}
+								mains.put("jhwjh", jhwjh);
+								mains.put("zy", zy);
+							}
+						}
+					}
+					
+				}
+			}
+			
+		}
+
         Map<String,Object> mapData = new HashMap<String, Object>();
 		mapData.put("mainData", mainList);
 		mapData.put("mainData1", mainList1);
+		mapData.put("mainData2", mainList2);
 		mapData.put("status", "success");
 		return JSON.toJSONString(ResponseEntity.ok(mapData));
 	}