出入库期限

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

@@ -108,7 +108,7 @@ public class ReceiveNoticeController {
 		logger.info("市平台传推送过来的轮换通知单是：\n"+notice);
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		try {
-			modelMap = receiveNoticeService.add(notice);
+			modelMap = receiveNoticeService.receiveNotice(notice);
 		} catch (Exception e) {
 			//e.printStackTrace();
 			modelMap.put("status", "error");

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

@@ -108,14 +108,34 @@ public class BusinessStoreWareDetail {
     private Integer inApplication;
     private boolean selected;
     private Date receiveTime;
+    private int expiredOrNot;//是否超过出入库期限 1是0否
+    private String outboundExpirationDate;//出库期限(区间)
     
     
     
     
     
     
+    
+    
+
+    public String getOutboundExpirationDate() {
+		return outboundExpirationDate;
+	}
+
+	public void setOutboundExpirationDate(String outboundExpirationDate) {
+		this.outboundExpirationDate = outboundExpirationDate;
+	}
+
+	public int getExpiredOrNot() {
+		return expiredOrNot;
+	}
+
+	public void setExpiredOrNot(int expiredOrNot) {
+		this.expiredOrNot = expiredOrNot;
+	}
 
-    public Date getReceiveTime() {
+	public Date getReceiveTime() {
 		return receiveTime;
 	}
 

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

@@ -15,7 +15,8 @@ public interface ReceiveNoticeService {
 
 	void update(BusinessNoticeReceive businessNoticeReceive);
 
-	Map<String, Object> add(String notice) throws Exception;
+	Map<String, Object> receiveNotice(String notice) throws Exception;
+
 	
 
 }

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

@@ -126,7 +126,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 
 	@Override
-	public Map<String, Object> add(String notice) throws Exception {
+	public Map<String, Object> receiveNotice(String notice) throws Exception {
 
         Map<String, Object> modelMap = new HashMap<String, Object>();
 
@@ -135,142 +135,167 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
             JSONObject jsonObject = JSONObject.parseObject(notice);
             BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
             businessNoticeReceive.setNoticeNumber(jsonObject.getString("tzdid")); //接收通知单编号
+            
+            /**
+             * 根据通知单编号查询是否存在 存在则更改出库期限时间
+             * 否则 新增数据
+             */
+
+            BusinessNoticeReceiveExample example = new BusinessNoticeReceiveExample();
+            Criteria createCriteria = example.createCriteria();
+            createCriteria.andNoticeNumberEqualTo(jsonObject.getString("tzdid"));
+            List<BusinessNoticeReceive> selectByExample = businessNoticeReceiveMapper.selectByExample(example);
+            
+            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("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出
+                        businessNoticeReceive.setForwardingUnit(jsonObject.getString("khssyqmc")); //发货单位
+                    }else if (ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("02")){
+                        businessNoticeReceive.setCrktype("1"); //1入 3出
+                        businessNoticeReceive.setReceiveUnit(jsonObject.getString("ssyqmc")); //收货单位
+                    }else if(ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("03")){
+                        businessNoticeReceive.setCrktype("13"); //1入 3出
+                        businessNoticeReceive.setForwardingUnit(jsonObject.getString("khssyqmc")); //发货单位
+                    }
 
-            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出
-                    businessNoticeReceive.setForwardingUnit(jsonObject.getString("khssyqmc")); //发货单位
-                }else if (ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("02")){
-                    businessNoticeReceive.setCrktype("1"); //1入 3出
-                    businessNoticeReceive.setReceiveUnit(jsonObject.getString("ssyqmc")); //收货单位
-                }else if(ObjectUtils.toString(jsonObject.getString("tzdlx")).equals("03")){
-                    businessNoticeReceive.setCrktype("13"); //1入 3出
-                    businessNoticeReceive.setForwardingUnit(jsonObject.getString("khssyqmc")); //发货单位
-                }
-
-                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")){
-                    businessNoticeReceive.setYwtype("3");
-                }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("7")){
-                    businessNoticeReceive.setYwtype("2");
-                }
+                    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")){
+                        businessNoticeReceive.setYwtype("3");
+                    }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("7")){
+                        businessNoticeReceive.setYwtype("2");
+                    }
 
-                businessNoticeReceive.setContractNumber(jsonObject.getString("sshtbm")); //协议编号/合同编号
+                    businessNoticeReceive.setContractNumber(jsonObject.getString("sshtbm")); //协议编号/合同编号
 
-                String hwbm = jsonObject.getString("cfbm");
-                if(hwbm!=null){
-                    Integer grainAttribute = 0 ;
-                    Integer grainKind = 0;
-                    //根据仓房编码查询仓房、货位、组织机构数据
-                    Map<String, Object> wareDataMap = feignBasicService.getWareDataByHwbm(hwbm);
-                    if (null == wareDataMap) {
-                        modelMap.put("msg", "未获取到对应仓房和货位信息");
-                        modelMap.put("status", "error");
-                    } else {
-                        Integer houseId = (Integer) wareDataMap.get("houseId");
-                        Integer wareHouseId = (Integer) wareDataMap.get("wareHouseId");
-                        Integer orgId = (Integer) wareDataMap.get("orgId");
-                        businessNoticeReceive.setHouseId(houseId); //仓房
-                        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);//1004是生产年份的父ID
-                                    businessNoticeReceive.setGrainKind((Integer) basicMap.get("enumId")); //接收的品种大类
+                    String hwbm = jsonObject.getString("cfbm");
+                    if(hwbm!=null){
+                        Integer grainAttribute = 0 ;
+                        Integer grainKind = 0;
+                        //根据仓房编码查询仓房、货位、组织机构数据
+                        Map<String, Object> wareDataMap = feignBasicService.getWareDataByHwbm(hwbm);
+                        if (null == wareDataMap) {
+                            modelMap.put("msg", "未获取到对应仓房和货位信息");
+                            modelMap.put("status", "error");
+                        } else {
+                            Integer houseId = (Integer) wareDataMap.get("houseId");
+                            Integer wareHouseId = (Integer) wareDataMap.get("wareHouseId");
+                            Integer orgId = (Integer) wareDataMap.get("orgId");
+                            businessNoticeReceive.setHouseId(houseId); //仓房
+                            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);//1004是生产年份的父ID
+                                        businessNoticeReceive.setGrainKind((Integer) basicMap.get("enumId")); //接收的品种大类
+                                    }
                                 }
+                            }else{
+                                //根据仓房、货位、orgId获取粮食品种等信息
+                                Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
+                                grainAttribute = (Integer) map.get("hwxz"); //粮油性质
+                                grainKind = (Integer) map.get("pz"); //品种
+                                Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
+                                Integer grainGrade = (Integer) map.get("dj"); //等级
+                                String inputTime = map.get("rq")+""; //入库时间
+                                Integer scnf = Integer.parseInt(map.get("scnf")+"");
+                                Date date = null;
+                                if(inputTime!=null){
+                                    date = ParameterUtil.string2datetime(inputTime);
+                                    businessNoticeReceive.setInputTime(date);//入库时间
+                                }
+                                businessNoticeReceive.setProductiveYear(scnf);//生产年份
+                                businessNoticeReceive.setGrainAnnual(scnf);//收获年度
+
+                                Integer grainProducingArea = (Integer) map.get("gb"); //产地
+
+                                businessNoticeReceive.setGrainKind(grainKind); //品种
+                                businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
+                                businessNoticeReceive.setGrainGrade(grainGrade); //等级
+                                businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
+                                businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
+
                             }
-                        }else{
-                            //根据仓房、货位、orgId获取粮食品种等信息
-                            Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
-                            grainAttribute = (Integer) map.get("hwxz"); //粮油性质
-                            grainKind = (Integer) map.get("pz"); //品种
-                            Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
-                            Integer grainGrade = (Integer) map.get("dj"); //等级
-                            String inputTime = map.get("rq")+""; //入库时间
-                            Integer scnf = Integer.parseInt(map.get("scnf")+"");
-                            Date date = null;
-                            if(inputTime!=null){
-                                date = ParameterUtil.string2datetime(inputTime);
-                                businessNoticeReceive.setInputTime(date);//入库时间
-                            }
-                            businessNoticeReceive.setProductiveYear(scnf);//生产年份
-                            businessNoticeReceive.setGrainAnnual(scnf);//收获年度
+                            String  lsyqsl = jsonObject.getString("lsyqsl");
+//                            BigDecimal s = new BigDecimal(1000);
+//                            BigDecimal sumjhsl = new BigDecimal(lsyqsl);
+//                            BigDecimal sumCkslss = sumjhsl.multiply(s);
+                            //String count = sumCkslss.toString(); //吨转化为公斤
 
-                            Integer grainProducingArea = (Integer) map.get("gb"); //产地
+                            businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
+                            businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
 
-                            businessNoticeReceive.setGrainKind(grainKind); //品种
-                            businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
-                            businessNoticeReceive.setGrainGrade(grainGrade); //等级
-                            businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
-                            businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
+                            businessNoticeReceive.setInApplication(1); //启用
 
+                            businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
+                            businessNoticeReceiveMapper.insert(businessNoticeReceive);
                         }
-                        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")); //出库期限(日期格式)
 
-                        businessNoticeReceive.setInApplication(1); //启用
+                       /**
+                        * 修改粮食性质(轮换或者销售进行修改)
+                        *   parameters[0] = ;     //单位ID
+                            parameters[1] = ;     //粮食品种
+                            parameters[2] = null; //空就行
+                            parameters[3] = ;     //仓房ID
+                            parameters[4] = ;     //货位ID
+                            parameters[5] = ;     //需要改变成的粮食性质
+                            parameters[6] = ;     //原来的粮食性质
+                            parameters[7] = ;     //库存数量或者要改变的数量
+                            parameters[8]=;      //批准文号(山西用)
+                            parameters[9]=;      //性质变动原因
+                            parameters[10] = ;  //1:新增；2：修改；3：删除
+                        */
+                       /*if(!ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){
+                           Object parameters[] = new Object[11];
+                           parameters[0] = orgId+"";//组织id
+                           parameters[1] = grainKind+"";//粮食品种
+                           parameters[2] = null;//
+                           parameters[3] = houseId+"";//仓房id
+                           parameters[4] = wareHouseId+"";//货位id
+                           parameters[5] = 6871+"";//需要改变成的粮食性质(其他商品粮)
+                           parameters[6] = grainAttribute+"";//原来的粮食性质
+                           parameters[7] = count+"";//原来的粮食性质
+                           parameters[8] = jsonObject.getString("tzdid")+"";//原来的粮食性质
+                           parameters[9] = "转储性质变动";
+                           parameters[10] = 2+"";
+                           String str = createKC.createKC("ChangeGrainAttribute", url, parameters);
+                            if ("true".equals(str)) {
+                                modelMap.put("status", "success");
+                            } else {
+                                modelMap.put("status", "error");
+                                modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");
+                                return modelMap;
+                            }
+                       }*/
 
-                        businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
-                        businessNoticeReceiveMapper.insert(businessNoticeReceive);
+                    }else{
+                        modelMap.put("msg", "仓房编码为空");
+                        modelMap.put("status", "error");
                     }
 
-
-                   /**
-                    * 修改粮食性质(轮换或者销售进行修改)
-                    *   parameters[0] = ;     //单位ID
-                        parameters[1] = ;     //粮食品种
-                        parameters[2] = null; //空就行
-                        parameters[3] = ;     //仓房ID
-                        parameters[4] = ;     //货位ID
-                        parameters[5] = ;     //需要改变成的粮食性质
-                        parameters[6] = ;     //原来的粮食性质
-                        parameters[7] = ;     //库存数量或者要改变的数量
-                        parameters[8]=;      //批准文号(山西用)
-                        parameters[9]=;      //性质变动原因
-                        parameters[10] = ;  //1:新增；2：修改；3：删除
-                    */
-                   /*if(!ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){
-                       Object parameters[] = new Object[11];
-                       parameters[0] = orgId+"";//组织id
-                       parameters[1] = grainKind+"";//粮食品种
-                       parameters[2] = null;//
-                       parameters[3] = houseId+"";//仓房id
-                       parameters[4] = wareHouseId+"";//货位id
-                       parameters[5] = 6871+"";//需要改变成的粮食性质(其他商品粮)
-                       parameters[6] = grainAttribute+"";//原来的粮食性质
-                       parameters[7] = count+"";//原来的粮食性质
-                       parameters[8] = jsonObject.getString("tzdid")+"";//原来的粮食性质
-                       parameters[9] = "转储性质变动";
-                       parameters[10] = 2+"";
-                       String str = createKC.createKC("ChangeGrainAttribute", url, parameters);
-                        if ("true".equals(str)) {
-                            modelMap.put("status", "success");
-                        } else {
-                            modelMap.put("status", "error");
-                            modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");
-                            return modelMap;
-                        }
-                   }*/
-
                 }else{
-                    modelMap.put("msg", "仓房编码为空");
+                    modelMap.put("msg", "通知单或者业务类型为空");
                     modelMap.put("status", "error");
                 }
-
-            }else{
-                modelMap.put("msg", "通知单或者业务类型为空");
-                modelMap.put("status", "error");
             }
+            
 
         }else{
             modelMap.put("msg", "参数为空");

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

@@ -19,6 +19,7 @@ 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.BusinessNoticeReceiveMapper;
 import com.chinaitop.depot.pushs.service.PushsService;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
 
@@ -38,6 +39,8 @@ public class PushServiceImpl implements PushsService{
     private BusinessLadingMapper ladingMapper;
 	@Resource
 	private ReceiveNoticeService receiveNoticeService;
+	@Resource
+	private BusinessNoticeReceiveMapper receiveNoticeMapper;
 
 
 
@@ -132,6 +135,34 @@ public class PushServiceImpl implements PushsService{
 					}
 				}
 				
+				
+				
+				//判断出库期限 储备粮通知单
+				if(mains.containsKey("create_unit")){
+					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());
+								/*try {
+									SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+									String nowTime = sdf.format(new Date());
+									//1是0否
+									if(sdf.parse(nowTime).getTime()<sdf.parse(noticeReceive.getOutgoingPeriod()).getTime()){
+										json.get(j).setExpiredOrNot(0);
+									}else{
+										json.get(j).setExpiredOrNot(1);
+									}
+									json.get(j).setOutgoingPeriod(sdf.parse(noticeReceive.getOutgoingPeriod()));
+								} catch (ParseException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
+								}*/
+							}
+						}
+					}
+				}
+				
 			}
 			
 			mains.put("fromData",json);//从表数据以json形式插入主表数据