。

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

@@ -372,7 +372,7 @@ public class BusinessStoreWareDetailController {
      */
     @SuppressWarnings("unchecked")
     @RequestMapping(value="/getRkRemainNumber",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
-    @ApiOperation(value="剩余数量(入库通知单)", notes = "剩余数量(入库通知单)")
+    @ApiOperation(value="储备粮管理下查询通知单剩余数量(入库通知单)", notes = "剩余数量(入库通知单)")
     @ApiImplicitParams({
     	@ApiImplicitParam(name = "receiveNoticeList", value = "选中的数据", paramType = "query")
     })
@@ -442,7 +442,7 @@ public class BusinessStoreWareDetailController {
      */
     @SuppressWarnings("unchecked")
     @RequestMapping(value="/getCkRemainNumber",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
-    @ApiOperation(value="剩余数量(出库通知单)", notes = "剩余数量(出库通知单)")
+    @ApiOperation(value="储备粮管理下查询剩余数量(出库通知单)", notes = "剩余数量(出库通知单)")
     @ApiImplicitParams({
     	@ApiImplicitParam(name = "receiveNoticeListJson", value = "选中的数据", paramType = "query")
     })

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

@@ -16,6 +16,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
@@ -70,21 +72,21 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		BusinessNoticeReceiveExample example = new BusinessNoticeReceiveExample();
         Criteria createCriteria = example.createCriteria();
         
-        if(lyflag!=null){
-        	if(lyflag.equals("0")){//油
+        if (lyflag != null) {
+        	if (lyflag.equals("0") ){//油
         		createCriteria.andHouseIdIsNotNull();
         		createCriteria.andWareHouseIdIsNull();
-        	}else if(lyflag.equals("1")){//粮
+        	} else if (lyflag.equals("1")) {//粮
         		createCriteria.andHouseIdIsNotNull();
         		createCriteria.andWareHouseIdIsNotNull();
         	}
-        }else{
+        } else {
         	//仓房
-            if(businessNoticeReceive.getHouseId()!=null){
+            if (businessNoticeReceive.getHouseId() != null) {
             	createCriteria.andHouseIdEqualTo(businessNoticeReceive.getHouseId());
             }
             //货位
-            if(businessNoticeReceive.getWareHouseId()!=null){
+            if (businessNoticeReceive.getWareHouseId() != null) {
             	createCriteria.andWareHouseIdEqualTo(businessNoticeReceive.getWareHouseId());
             }
         }
@@ -94,12 +96,12 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         	createCriteria.andCrktypeEqualTo(businessNoticeReceive.getCrktype());
         }
 		//业务类型  竞买 销售 轮换
-        if(cktzd!=null && cktzd.equals("0")){
-        	if(businessNoticeReceive.getYwtype()!=null && businessNoticeReceive.getYwtype()!=""){
-            	createCriteria.andYwtypeNotEqualTo(businessNoticeReceive.getYwtype());
+        if (cktzd!=null && cktzd.equals("0")) {
+        	if (StringUtils.isNotBlank(businessNoticeReceive.getYwtype())) {
+            	createCriteria.andYwtypeNotEqualTo(businessNoticeReceive.getYwtype());//查ywtype!=1的数据
             }
-        }else{
-        	if(businessNoticeReceive.getYwtype()!=null && businessNoticeReceive.getYwtype()!=""){
+        } else {
+        	if (businessNoticeReceive.getYwtype() != null && businessNoticeReceive.getYwtype()!=""){
             	createCriteria.andYwtypeEqualTo(businessNoticeReceive.getYwtype());
             }
         }
@@ -170,7 +172,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
         Map<String, Object> modelMap = new HashMap<String, Object>();
 
-        if(notice!=null){
+        if (notice != null) {
             // JSON字符串转对象
             JSONObject jsonObject = JSONObject.parseObject(notice);
             BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
@@ -186,19 +188,19 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
             createCriteria.andNoticeNumberEqualTo(jsonObject.getString("tzdid"));
             List<BusinessNoticeReceive> selectByExample = businessNoticeReceiveMapper.selectByExample(example);
             
-            if(selectByExample.size()>0){//存在修改
+            if(selectByExample.size()>0){//存在修改(只修改出库期限)
                 BusinessNoticeReceive record = new BusinessNoticeReceive();
                 record.setId(selectByExample.get(0).getId());
                 record.setOutgoingPeriod(jsonObject.getString("ckqx"));
             	int k = businessNoticeReceiveMapper.updateByPrimaryKeySelective(record);
             	if(k<0){
+            		modelMap.put("msg", "没有通知单编号为"+jsonObject.getString("tzdid")+"的数据");
                     modelMap.put("status", "error");
             	}
             }else{
             	/**
             	 * 新增
             	 */
-            	
             	if(jsonObject.getString("tzdlx")!=null && jsonObject.getString("ywlx")!=null){
                     if(ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("01")){ //出入库类型(01：出库 02:入库 03:出入库)
                         businessNoticeReceive.setCrktype("3"); //1入 3出
@@ -209,14 +211,25 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                     }else if(ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("03")){
                         businessNoticeReceive.setCrktype("13"); //1入 3出
                         businessNoticeReceive.setForwardingUnit(jsonObject.getString("khssyqmc")); //发货单位
+                    } else {
+                    	modelMap.put("msg", "未识别的通知单类型");
+                        modelMap.put("status", "error");
+                        return modelMap;
                     }
 
-                    if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){  //业务类型 (6:竞买=入库竞价；7：销售=出库竞价  4：轮换=出库包干)
+                    //业务类型 (3:兜底,4:轮换=出库包干,6:竞买=入库竞价,7:销售=出库竞价  )
+                    if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")) {  //业务类型 (6:竞买=入库竞价；7：销售=出库竞价  4：轮换=出库包干)
                         businessNoticeReceive.setYwtype("1"); //1收储=竞买=竞价 2 销售=竞价 3轮换=包干
-                    }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("4")){
+                    } else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("4")){//4：轮换=出库包干
                         businessNoticeReceive.setYwtype("3");
-                    }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("7")){
+                    }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("7")){//7：销售=出库竞价
                         businessNoticeReceive.setYwtype("2");
+                    } else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("3")){//兜底
+                        businessNoticeReceive.setYwtype("4");
+                    } else {
+                    	modelMap.put("msg", "未识别的业务类型");
+                        modelMap.put("status", "error");
+                        return modelMap;
                     }
 
                     businessNoticeReceive.setContractNumber(jsonObject.getString("sshtbm")); //协议编号/合同编号
@@ -236,7 +249,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
                             modelMap.put("msg", "根据值"+hwbm+"未获取到对应仓房货位信息，请核对数据");
                             modelMap.put("status", "error");
-
+                            return modelMap;
                         } else {
                             Integer houseId = (Integer) wareDataMap.get("houseId");
                             Integer wareHouseId = (Integer) wareDataMap.get("wareHouseId");
@@ -246,20 +259,75 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             	businessNoticeReceive.setWareHouseId(wareHouseId); //货位
                             }
                             businessNoticeReceive.setOrgId(orgId);  //组织id
-                            if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){//入库竞价的业务类型
-                                if(jsonObject.getString("pz")!=null){
-                                    String code = jsonObject.getString("pzbm");//品种编码
-                                    if (StringUtils.isNotBlank(code)) {
-                                        code = code.substring(0,3);//获取前三位
-                                        Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, code);//1061是粮食品种的父ID
-                                        logger.info("获取到的品种数据如下：");
-                            			logger.info(basicMap.toString());
-                                        businessNoticeReceive.setGrainKind((Integer) basicMap.get("enumId")); //接收的品种大类
-                                    }
+                            if (ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("02")) {//入库类型
+                            	String pzbm = jsonObject.getString("pzbm");//品种编码
+                                if (StringUtils.isNotBlank(pzbm)) {
+                                    String lypz = null;
+                                    if ("2130000".equals(pzbm) || "1410000".equals(pzbm)) {//原油
+                        				logger.info("根据品种编码"+pzbm+"获取到的品种数据如下：");
+                        				logger.info("原油对应的字典ID是：7144");
+                        				lypz = "7144";
+                        			} else {
+                        				Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, pzbm);
+                        				lypz = basicMap.get("enumId")+"";
+                        				logger.info("根据"+pzbm+"获取到的品种数据如下：");
+                        				logger.info(basicMap.toString());
+                        			}
+                        			if (StringUtils.isNotBlank(lypz)) {
+                        				businessNoticeReceive.setGrainKind(Integer.parseInt(lypz));
+                        			} else {
+                        				modelMap.put("msg", "pzbm--"+pzbm+"--有误或不合理");
+                                        modelMap.put("status", "error");
+                                        return modelMap;
+                        			}
+                                } else {
+                                	modelMap.put("msg", "pzbm不能为空");
+                                    modelMap.put("status", "error");
+                                    return modelMap;
+                                }
+
+                                String mxbm = jsonObject.getString("mxbm");//明细品种编码
+                                if (StringUtils.isNotBlank(mxbm)) {
+                                    String mxpz = null;
+                                    if ("2130000".equals(mxbm) || "1410000".equals(mxbm)) {//原油下的明细下只用大豆原油
+                        				logger.info("根据明细品种编码"+mxbm+"获取到的明细品种数据如下：");
+                        				logger.info("原油明细品种对应的字典ID是：7145");
+                        				mxpz = "7145";
+                        			} else {
+                        				Integer enumid = getEnumId(businessNoticeReceive.getGrainKind(), mxbm);
+                        				mxpz = enumid+"";
+                        				logger.info("根据"+mxbm+"获取到的明细品种数据是："+enumid);
+                        			}
+                        			if (StringUtils.isNotBlank(mxpz)) {
+                        				businessNoticeReceive.setGrainDetailKind(Integer.parseInt(mxpz));
+                        			} else {
+                        				modelMap.put("msg", "mxbm--"+mxbm+"--有误或不合理");
+                                        modelMap.put("status", "error");
+                                        return modelMap;
+                        			}
+                                } else {
+                                	modelMap.put("msg", "mxbm不能为空");
+                                    modelMap.put("status", "error");
+                                    return modelMap;
                                 }
-                            }else{
+                                
+                                String scndbm = jsonObject.getString("scnf");//生产年度
+                                if (StringUtils.isNotBlank(mxbm)) {
+                                	String scnf = null;
+                                	Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1004, scndbm, null);
+                                	scnf = basicMap.get("enumId")+"";
+                    				logger.info("根据"+scndbm+"获取到的生产年份数据如下：");
+                    				logger.info(basicMap.toString());
+                    				if (StringUtils.isNotBlank(scnf)) {
+                    					businessNoticeReceive.setProductiveYear(Integer.parseInt(scnf));//生产年份
+                    					businessNoticeReceive.setGrainAnnual(Integer.parseInt(scnf));//收获年度
+                    				}
+                                }
+                            } else {
                                 //根据仓房、货位、orgId获取粮食品种等信息
                                 Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
+                                logger.info("根据orgId="+orgId+"，houseId="+houseId+",warehouseId="+wareHouseId+"  获取到的库存数据如下：");
+                    			logger.info(map+"");
                                 grainAttribute = (Integer) map.get("hwxz"); //粮油性质
                                 grainKind = (Integer) map.get("pz"); //品种
                                 Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
@@ -299,11 +367,6 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
                             }
                             String  lsyqsl = jsonObject.getString("lsyqsl");
-//                            BigDecimal s = new BigDecimal(1000);
-//                            BigDecimal sumjhsl = new BigDecimal(lsyqsl);
-//                            BigDecimal sumCkslss = sumjhsl.multiply(s);
-                            //String count = sumCkslss.toString(); //吨转化为公斤
-
                             businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
                             businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
 
@@ -328,7 +391,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
             }
             
 
-        }else{
+        } else {
             modelMap.put("msg", "所传数据不能为空");
             modelMap.put("status", "error");
         }
@@ -336,7 +399,30 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		return modelMap;
 	}
 
-
+	/**
+	 * 根据字典父级ID和国标编码获取下面的一个字典ID
+	 * @param parentId
+	 * @param gbCode
+	 * @return
+	 */
+	private Integer getEnumId(int parentId, String gbCode) {
+		Integer enumId = null;
+		Map<String, Object> map = feignBasicService.findConditionEnum(parentId, null, null);
+		if (null != map) {
+			String json_str = JSON.toJSONString(map);
+			JSONObject json_obj = JSONObject.parseObject(json_str);
+			JSONArray array = JSONArray.parseArray(json_obj.getString("enumList"));
+			for (int i = 0; i < array.size(); i++) {
+				JSONObject object = JSONObject.parseObject(array.get(i).toString());
+				String code = object.getString("gbcode");
+				if (code.equals(gbCode)) {
+					enumId = Integer.parseInt(object.getString("id"));
+					break;
+				}
+			}
+		}
+		return enumId;
+	}
 
 	@Override
 	public List<BusinessNoticeReceive> queryByExample(BusinessNoticeReceive businessNoticeReceive) {