1

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

@@ -164,66 +164,25 @@ public class ReceiveNoticeController {
     public int getNoticeNoAuditList(String xybh,String sptDataId,Integer flag) throws Exception {
         return receiveNoticeService.queryIsOrAudit(xybh,sptDataId,flag);
     }
-	
-	
-	@RequestMapping(value="/saveDataRk", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
-    @ApiOperation(value="增加性质转变单数据(入库)", notes = "增加性质转变单数据(入库)")
-	@ApiImplicitParams({
-        @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
-        @ApiImplicitParam(name = "storehouseId", value = "仓房", paramType = "query"),
-        @ApiImplicitParam(name = "warehouseId", value = "货位", paramType = "query"),
-        @ApiImplicitParam(name = "rksl", value = "入库数量", paramType = "query"),
-        @ApiImplicitParam(name = "grainVarietyName", value = "品种名称", paramType = "query")
-    })
-    public void saveDataRk(String orgId,Integer storehouseId,Integer warehouseId,String grainVarietyName,
-    		BigDecimal rksl,String lsxzzbdh) {
-		
-		 logger.info("接收到的参数是："+orgId+"--"+storehouseId+"**"+warehouseId+"**"+grainVarietyName+"**"+rksl+"//"+lsxzzbdh);
-		receiveNoticeService.saveDataRk( orgId, storehouseId, warehouseId, grainVarietyName,
-	    		 rksl, lsxzzbdh,null);
-    	
-    }
-	
-	
-	@RequestMapping(value="/saveDataRkByRest", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
-    @ApiOperation(value="增加性质转变单数据(入库)", notes = "增加性质转变单数据(入库)")
+
+	@RequestMapping(value="/scRkxzzbd", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="增加性质转变单数据(入库)", notes = "")
 	@ApiImplicitParams({
-        @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
-        @ApiImplicitParam(name = "storehouseId", value = "仓房", paramType = "query"),
-        @ApiImplicitParam(name = "warehouseId", value = "货位", paramType = "query"),
-        @ApiImplicitParam(name = "rksl", value = "入库数量", paramType = "query"),
-        @ApiImplicitParam(name = "grainVarietyName", value = "品种名称", paramType = "query")
+        @ApiImplicitParam(name = "hwbm", value = "货位编码", paramType = "query")
     })
-	public void saveDataRkByRest(@RequestBody MultiValueMap<String,String> map) {
-		
-		logger.info("入库验收接收到的性质转变单:"+map);
-		List<String> orgIdList = map.get("orgId");
-		String orgId = (String) orgIdList.get(0);
-		
-		List<String> storehouseIdList = map.get("storehouseId");
-		Integer storehouseId = Integer.valueOf(storehouseIdList.get(0));
-		
-		List<String> warehouseIdList = map.get("warehouseId");
-		Integer warehouseId = Integer.valueOf(warehouseIdList.get(0));
-
-		
-		List<String> grainVarietyNameList = map.get("grainVarietyName");
-		String grainVarietyName = (String) grainVarietyNameList.get(0);
-		
-		List<String> rkslList = map.get("rksl");
-		BigDecimal rksl = new BigDecimal(rkslList.get(0));
-	
-		List<String> lsxzzbdhList =  map.get("lsxzzbdh");
-		String lsxzzbdh = lsxzzbdhList.get(0);
-		
-		List<String> xyhList =  map.get("xyh");
-		String xyh = xyhList.get(0);
-		
-		logger.info("接收到的参数是：orgId:"+orgId+"--"+"storehouseId:"+storehouseId+"**"+warehouseId+"**"+grainVarietyName+"**"+rksl+"//"+lsxzzbdh);
-		receiveNoticeService.saveDataRk( orgId, storehouseId, warehouseId, grainVarietyName,
-	    		 rksl, lsxzzbdh, xyh);
-    }
-	
-	
+	public Map<String, Object> scRkxzzbd(String hwbm) {
+		Map<String, Object> map = new HashMap<>();
+		try {
+			map = receiveNoticeService.scRkxzzbd(hwbm);
+			systemOutsideDataService.addlogger("rkxzzbd", hwbm, map.toString());
+		} catch (Exception e) {
+			logger.error("性质转变单生成异常");
+			logger.error(e.getMessage());
+			map.put("status", "error");
+			map.put("msg", "接口异常，请联系管理员！");
+			systemOutsideDataService.addlogger("rkxzzbd", hwbm, map.toString());
+		}
+		return map;
+	}
     
 }

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

@@ -287,7 +287,6 @@
       <if test="htbh != null">
         htbh,
       </if>
-      
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >

src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceive.java

@@ -822,4 +822,5 @@ public class BusinessNoticeReceive {
 	public void setHtbh(String htbh) {
 		this.htbh = htbh;
 	}
+
 }

src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceiveExample.java

@@ -230,13 +230,12 @@ public class BusinessNoticeReceiveExample {
             addCriterion("is_notice =", value, "isNotice");
             return (Criteria) this;
         }
-        
+
         public Criteria andIsSheetEqualTo(Integer value) {
             addCriterion("is_sheet =", value, "isSheet");
             return (Criteria) this;
         }
-        
-        
+
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;

src/main/java/com/chinaitop/depot/business/service/ReceiveNoticeService.java

@@ -26,11 +26,6 @@ public interface ReceiveNoticeService {
 
 	int queryIsOrAudit(String xybh, String sptDataId,Integer flag);
 
-	//void saveDataRk(Map<String, Object> paramMap);
-
-	void saveDataRk(String orgId, Integer storehouseId, Integer warehouseId, String grainVarietyName, BigDecimal rksl,
-			String lsxzzbdh,String xyh);
-
 	/**
 	 * 修改下发的通知单数据
 	 * @param notice
@@ -43,5 +38,12 @@ public interface ReceiveNoticeService {
 	 * @param notice
 	 */
 	void pushHtStatus(String notice) throws Exception;
+
+	/**
+	 * 生成入库性质转变单
+	 * @param datas
+	 * @return
+	 */
+	Map<String, Object> scRkxzzbd(String datas);
 			
 }

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

@@ -31,9 +31,11 @@ import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
 import com.chinaitop.depot.business.service.SystemOutsideDataService;
+import com.chinaitop.depot.feignService.DepotSystemFeignService;
 import com.chinaitop.depot.system.service.SysCodeService;
 import com.chinaitop.depot.utils.HTTPUtils;
 import com.chinaitop.depot.utils.ParameterUtil;
+import com.chinaitop.depot.utils.createKC;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 
@@ -47,6 +49,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	@Resource
 	private FeignAgileService feignAgileService;
 	@Resource
+	private DepotSystemFeignService depotSystemFeignService;
+	@Resource
     private BusinessApprovalService businessApprovalService;
 	@Resource
 	private BusinessContractReceiveService businessContractReceiveService;
@@ -56,9 +60,6 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	private SystemOutsideDataService systemOutsideDataService;
 
 	public static final Logger logger = LoggerFactory.getLogger(ReceiveNoticeServiceImpl.class);
-    /*@Resource
-    private BusinessApprovalMapper approvalMapper;*/
-
 	
 	// 获取ip地址
     @Value("${crk-webservice}")
@@ -141,6 +142,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         if(businessNoticeReceive.getIsSheet()!=null){
         	createCriteria.andIsSheetEqualTo(businessNoticeReceive.getIsSheet());
         }
+
         if(pageNum!=null && pageSize!=null){
         	PageHelper.startPage(pageNum, pageSize);
         }
@@ -323,7 +325,13 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                     					businessNoticeReceive.setGrainAnnual(Integer.parseInt(scnf));//收获年度
                     				}
                                 }
-                            } else {
+                                //入库兜底类型的不需要审批性质转变单
+                                if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("3")) {
+                                	businessNoticeReceive.setIsSheet(1);
+                                } else {
+                                	businessNoticeReceive.setIsSheet(0);
+                                }
+                            } else {//出库类型
                                 //根据仓房、货位、orgId获取粮食品种等信息
                                 Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
                                 logger.info("根据orgId="+orgId+"，houseId="+houseId+",warehouseId="+wareHouseId+"  获取到的库存数据如下：");
@@ -364,7 +372,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                                 businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));//粮食性质转变单单号
                                 //SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
                                 businessNoticeReceive.setHzrq(new Date());//划转时间
-
+                                businessNoticeReceive.setIsSheet(0);//是性质转变单
                             }
                             String  lsyqsl = jsonObject.getString("lsyqsl");
                             businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
@@ -374,7 +382,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
                             businessNoticeReceive.setAuditState(0);//下达未审批
                             businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
-                            businessNoticeReceive.setIsSheet(0);//是性质转变单
+                            //businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
                             businessNoticeReceiveMapper.insert(businessNoticeReceive);
                            
                         }
@@ -441,7 +449,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         	createCriteria.andWareHouseIdEqualTo(businessNoticeReceive.getWareHouseId());
         }
         
-      //货位
+        //货位
         if(businessNoticeReceive.getOrgId()!=null){
         	createCriteria.andOrgIdEqualTo(businessNoticeReceive.getOrgId());
         }
@@ -521,11 +529,40 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         }
        //增加审批表数据
     	businessApprovalService.add(businessApproval);
-        
-		
-	}
 
+    	//必须是入库，并且不是通知单，只是性质转变单
+    	if ("1".equals(receiveNotice.getIsNotice()) && "1".equals(receiveNotice.getIsSheet()) && "1".equals(receiveNotice.getCrktype())) {
+    		restLsxz(receiveNotice.getId());
+    	}
+	}
 
+	public void restLsxz(Integer id) {
+		/* 先调用出入库接口生成转储的业务的台账信息，生成失败不可保存转储数据***start */
+		BusinessNoticeReceive receiveNotice = businessNoticeReceiveMapper.selectByPrimaryKey(id);
+		Object[] parameters = new Object[9];
+		parameters[0] = receiveNotice.getOrgId() + "";
+		parameters[1] = receiveNotice.getGrainKind() + "";
+		//parameters[2] = null;
+		parameters[3] = receiveNotice.getHouseId() + "";
+		if (StringUtils.isNotBlank(receiveNotice.getWareHouseId()+"")) {//粮仓
+			parameters[4] = receiveNotice.getWareHouseId() + "";
+		} else {
+			parameters[4] = receiveNotice.getHouseId() + "";//油罐
+		}
+		parameters[5] = receiveNotice.getHzqlsxzdm() + "";
+		parameters[6] = receiveNotice.getGrainAttribute() + "";
+		parameters[7] = Integer.parseInt(receiveNotice.getLssl())*1000 + "";
+		parameters[8] = 1 + ""; //1:新增；2：修改；3：删除
+		
+		String crkurl = depotSystemFeignService.getUrl(receiveNotice.getOrgId().toString(), "2");
+	    if (StringUtils.isNotBlank(crkurl)) {
+	    	String url_id = crkurl.substring(0, crkurl.lastIndexOf("Base")-1);
+	    	StringBuffer sbf = new StringBuffer();
+	    	sbf.append(url_id).append(url);
+	    	String str = createKC.createKC("ChangeGrainAttribute", sbf.toString(), parameters);
+	    	systemOutsideDataService.addlogger("rkxzzb", JSON.toJSONString(parameters), str);
+	    }
+	}
 
 	@Override
 	public int queryIsOrAudit(String xybh, String sptDataId,Integer flag) {
@@ -555,54 +592,6 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		
 	}
 
-
-
-	@Override
-	public void saveDataRk(String orgId, Integer storehouseId, Integer warehouseId, String grainVarietyName, BigDecimal rksl,
-			String lsxzzbdh,String xyh) {
-		// TODO Auto-generated method stub
-        
-		BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
-        //String orgId = (String) paramMap.get("orgId");
-        //Integer storehouseId =  (Integer) paramMap.get("storehouseId");
-        // warehouseId =  (Integer) paramMap.get("warehouseId");
-        //String pzmc = (String) paramMap.get("pzmc");
-       // String hzsl = (String) paramMap.get("hzsl");
-        //String lsxzzbdh = (String) paramMap.get("lsxzzbdh");
-		System.out.println("orgId:----------------------------"+orgId+"storehouseId:-"+storehouseId+"warehouseId"+"////"+warehouseId);
-		Map<String, Object> map = feignAgileService.getDateByChHwh(Integer.valueOf(orgId), storehouseId, warehouseId);
-		System.out.println("map:----------------------------"+map);
-		Integer grainKind = (Integer) map.get("pz"); //品种
-        Double kcsl = (Double) map.get("kcsl");//千克
-        Integer grainAttribute = (Integer) map.get("hwxz"); //粮油性质
-        businessNoticeReceive.setAuditState(0);//下发未审批
-        businessNoticeReceive.setIsNotice(1);//0是1否  是否是可以引用的通知单
-        businessNoticeReceive.setOrgId(Integer.valueOf(orgId));
-        businessNoticeReceive.setHouseId(storehouseId);
-        businessNoticeReceive.setWareHouseId(warehouseId);
-        businessNoticeReceive.setCount(rksl+"");
-        businessNoticeReceive.setPzmc(grainVarietyName);
-        businessNoticeReceive.setGrainKind(grainKind);
-        businessNoticeReceive.setGrainAttribute(3052); //入库 转前 3052商品粮
-        businessNoticeReceive.setHzqlsxzdm(grainAttribute);//入库 转后 
-        businessNoticeReceive.setContractNumber(xyh);
-        businessNoticeReceive.setLsxzzbdh(lsxzzbdh);
-        businessNoticeReceive.setNoticeNumber(lsxzzbdh);
-        businessNoticeReceive.setCrktype("1"); //1入 3出
-        BigDecimal s = new BigDecimal(1000);
-        System.out.println(kcsl+"kcsl");
-        BigDecimal kcslBig = new BigDecimal(String.valueOf(kcsl));
-        System.out.println(kcslBig+"kcslBig");
-
-        BigDecimal kcslKg = kcslBig.divide(s);
-        businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
-        businessNoticeReceive.setHzrq(new Date());
-        businessNoticeReceive.setReceiveTime(new Date());
-        businessNoticeReceive.setIsSheet(0);
-        businessNoticeReceiveMapper.insertSelective(businessNoticeReceive);
-        
-	}
-
 	@Override
 	public Map<String, Object> updateReceiveNotice(String notice) throws Exception {
 		Map<String, Object> map = new HashMap<>();
@@ -648,4 +637,101 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		return businessNoticeReceive;
 	}
 
+
+
+	@Override
+	public Map<String, Object> scRkxzzbd(String datas) {
+		Map<String, Object> result_map = new HashMap<>();
+		
+		if (datas != null) {
+            // JSON字符串转对象
+            JSONObject jsonObject = JSONObject.parseObject(datas);
+
+            BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
+
+            businessNoticeReceive.setCrktype("1"); //默认值：入库
+        	businessNoticeReceive.setYwtype("1");//默认值：竞价入库
+
+        	String hwbm = jsonObject.getString("hwbm");//货位国标编码
+            if (hwbm != null) {
+            	//查询仓房ID、货位ID、orgId
+                Map<String, Object> basicMap = feignBasicService.getWareOrTankObj(hwbm);
+                logger.info("根据值"+hwbm+"获取到的货位数据如下：");
+                logger.info(basicMap+"");
+                if ("0".equals(basicMap.get("houseId").toString()) 
+                		|| "0".equals(basicMap.get("warehouseId").toString()) 
+                		|| "0".equals(basicMap.get("orgId").toString())) {
+
+                	result_map.put("msg", "根据值"+hwbm+"未获取到对应仓房货位信息，请核对数据");
+                	result_map.put("status", "error");
+                    return result_map;
+                } else {
+                	Integer houseId = (Integer) basicMap.get("houseId");
+                    Integer wareHouseId = (Integer) basicMap.get("warehouseId");
+                    Integer orgId = (Integer) basicMap.get("orgId");
+                    businessNoticeReceive.setHouseId(houseId); //仓房
+                    if (!wareHouseId.toString().equals(houseId.toString())) {//只有粮仓才保存货位，油罐不保存货位
+                    	businessNoticeReceive.setWareHouseId(wareHouseId); //货位
+                    }
+                    businessNoticeReceive.setOrgId(orgId);  //组织id
+                }
+            } else {
+            	result_map.put("msg", "hwbm不能为空");
+            	result_map.put("status", "error");
+                return result_map;
+            }
+            
+            Map<String, Object> kcmap = feignAgileService.getDateByChHwh(businessNoticeReceive.getOrgId(), businessNoticeReceive.getHouseId(), businessNoticeReceive.getWareHouseId());
+            logger.info("根据orgId="+businessNoticeReceive.getOrgId()+"，houseId="+businessNoticeReceive.getHouseId()+",warehouseId="+businessNoticeReceive.getWareHouseId()+"  获取到的库存数据如下：");
+			logger.info(kcmap+"");
+			if (null != kcmap) {
+				String inputTime = kcmap.get("rq")+""; //入库时间
+	            Double kcsl = (Double) kcmap.get("kcsl");//千克
+	            Date date = null;
+	            if(inputTime!=null){
+	                date = ParameterUtil.string2datetime(inputTime);
+	                businessNoticeReceive.setInputTime(date);//入库时间
+	            }
+	            businessNoticeReceive.setProductiveYear(Integer.parseInt(kcmap.get("scnf")+""));//生产年份
+	            businessNoticeReceive.setGrainAnnual(Integer.parseInt(kcmap.get("scnf")+""));//收获年度
+                businessNoticeReceive.setGrainKind((Integer) kcmap.get("pz")); //品种
+	            businessNoticeReceive.setGrainDetailKind((Integer) kcmap.get("mxpz")); //明细品种
+	            businessNoticeReceive.setGrainGrade((Integer) kcmap.get("dj")); //等级
+	            businessNoticeReceive.setGrainAttribute((Integer) kcmap.get("hwxz")); //粮油性质
+	            businessNoticeReceive.setGrainProducingArea((Integer) kcmap.get("gb"));//产地
+	            
+	            /**
+	             * 库存数量转化为吨
+	             */
+	            BigDecimal s = new BigDecimal(1000);
+	            BigDecimal kcslBig = new BigDecimal(kcsl);
+	            BigDecimal kcslKg = kcslBig.divide(s);
+	            businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
+	            
+	            businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
+	            StringBuffer sbf = new StringBuffer(50);
+	            Date thisdate = new Date();
+	            sbf.append("RKXZZBD").append(String.format("%03d", businessNoticeReceive.getOrgId())).append(ParameterUtil.getDateYMDHMS(thisdate));
+	            businessNoticeReceive.setLsxzzbdh(sbf.toString());//粮食性质转变单单号
+	            businessNoticeReceive.setHzrq(thisdate);//划转时间
+	            businessNoticeReceive.setCount(businessNoticeReceive.getLssl()); //计划数量（吨）
+	            businessNoticeReceive.setInApplication(1); //启用
+	            businessNoticeReceive.setAuditState(0);//下达未审批
+	            businessNoticeReceive.setReceiveTime(thisdate);//接收数据的时间
+	            businessNoticeReceive.setIsNotice(1);//0是可以引用的通知单,1不是
+	            businessNoticeReceive.setIsSheet(0);//0代表是性质转变单
+	            businessNoticeReceiveMapper.insert(businessNoticeReceive);
+			} else {
+				result_map.put("msg", "根据所传信息没有查到对应库存信息");
+            	result_map.put("status", "error");
+                return result_map;
+			}
+        } else {
+        	result_map.put("msg", "所传数据不能为空");
+        	result_map.put("status", "error");
+        }
+		
+		return result_map;
+	}
+
 }

src/main/java/com/chinaitop/depot/feignService/DepotSystemFeignService.java

@@ -0,0 +1,23 @@
+package com.chinaitop.depot.feignService;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "DEPOT-SYSTEM")
+public interface DepotSystemFeignService {
+
+	/**
+	 * 查询一条配置的应急端系统URL
+	 * @param orgId 组织机构ID
+	 * @param userType 类型(1:库级,2:出入库)
+	 * @return 
+	 */
+	@RequestMapping(value = "/urlConfig/getUrl", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	String getUrl(
+			@RequestParam("orgId") String orgId, 
+			@RequestParam("userType") String userType
+			);
+}