webservice出入库通知单

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

@@ -743,7 +743,6 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         // 可以查询所有人通过的通知单
         BusinessDeliveryStorageNoticeExample example = new BusinessDeliveryStorageNoticeExample();
         Criteria createCriteria = example.createCriteria();
-        createCriteria.andAuditStateEqualTo(AuditType.AGREE.getAuditCode());
         if (deliveryStorageNotice != null) {
             // 凭证类型.
             if (StringUtils.isNotBlank(deliveryStorageNotice.getBillType())) {
@@ -764,6 +763,8 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             if (deliveryStorageNotice.getRootContractBid() != null) {
                 createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
             }
+        }else{
+            createCriteria.andAuditStateEqualTo(AuditType.AGREE.getAuditCode());
         }
         
         // 审批通过时间倒序.

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

@@ -94,35 +94,37 @@ public class PushServiceImpl implements PushsService{
 			criteria.andTypeIn(listType);//默认查询通知单类型数据
 			List<BusinessStoreWareDetail> json = businessStoreWareDetailMapper.selectByExample(businessStoreWareDetailExample);
 			mains.put("fromData",json);//从表数据以json形式插入主表数据
-			
 			//处理储备粮中的通知单 
-			if(null != mains.get("create_unit") && ("1").equals(mains.get("create_unit"))){
-				//数量转化为公斤
-				int a = Integer.valueOf(mains.get("shiping_count").toString())*1000;
-				mains.put("shiping_count", a);
-				//传字段 计划文件号 和摘要 用于分仓保管账
-				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 = "轮换";
+			if(null != mains.get("create_unit")){
+				if(mains.get("create_unit").equals(1)){
+					//数量转化为公斤
+					int a = Integer.valueOf(mains.get("shiping_count").toString())*1000;
+					mains.put("shiping_count", a);
+					//传字段 计划文件号 和摘要 用于分仓保管账
+					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);
 						}
-						mains.put("jhwjh", jhwjh);
-						mains.put("zy", zy);
 					}
 				}
+				
 			}
 		}