1

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

@@ -195,7 +195,9 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 			logger.info(basicMap+"");
 			if (!"0".equals(basicMap.get("houseId").toString()) && !"0".equals(basicMap.get("warehouseId").toString()) && !"0".equals(basicMap.get("orgId").toString())) {
 				dataobj.setHouseId(Integer.parseInt(basicMap.get("houseId").toString()));
-				dataobj.setWarehouseId(Integer.parseInt(basicMap.get("warehouseId").toString()));
+				if (hw_sptid.length() > 4) {//说明是粮食仓房的。如果是小于等于4，那就是油罐的数据，货位的值为空
+					dataobj.setWarehouseId(Integer.parseInt(basicMap.get("warehouseId").toString()));
+				}
 				dataobj.setOrgId(Integer.parseInt(basicMap.get("orgId").toString()));
 				dataobj.setInputTime(new Date());
 				dataobj.setUpdateTime(dataobj.getInputTime());

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

@@ -21,10 +21,9 @@ import com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessContract;
 import com.chinaitop.depot.business.model.BusinessContractExample;
+import com.chinaitop.depot.business.model.BusinessContractReceive;
 import com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice;
 import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample;
-import com.chinaitop.depot.business.model.BusinessLading;
-import com.chinaitop.depot.business.model.BusinessLadingExample;
 import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample.Criteria;
 import com.chinaitop.depot.business.model.BusinessPlan;
 import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
@@ -35,12 +34,14 @@ import com.chinaitop.depot.business.model.enums.StoreWareType;
 import com.chinaitop.depot.business.model.enums.TaskType;
 import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
 import com.chinaitop.depot.business.service.BusinessApprovalService;
+import com.chinaitop.depot.business.service.BusinessContractReceiveService;
 import com.chinaitop.depot.business.service.BusinessContractService;
 import com.chinaitop.depot.business.service.BusinessDeliveryStorageNoticeService;
 import com.chinaitop.depot.business.service.BusinessLadingService;
 import com.chinaitop.depot.business.service.BusinessPlanService;
 import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
 import com.chinaitop.depot.business.service.FeignAgileService;
+import com.chinaitop.depot.business.service.ReceiveNoticeService;
 import com.chinaitop.depot.business.service.UserInfoService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -70,6 +71,10 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
     private BusinessApprovalService businessApprovalService;
     @Resource
     private UserInfoService userInfoService;
+    @Resource
+	private ReceiveNoticeService receiveNoticeService;
+    @Resource
+    private BusinessContractReceiveService businessContractReceiveService;
     
     // 入库通知单枚举id,出入库系统使用.
     private static Integer STORAGENOTICEENUMID = 2816;
@@ -388,11 +393,34 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         approval.setTaskId(taskId);
         
         businessApprovalService.add(approval);
+
+        //符合以下条件，说明是储备粮下的入库通知单
+        if ("1".equals(businessDeliveryStorageNoticeB.getBillType()) && "1".equals(businessDeliveryStorageNoticeB.getCreateUnit())) {
+        	//给市平台推送合同被引用的消息
+        	pushHtStatus(businessDeliveryStorageNoticeB.getContractBid());
+        }
         
         return returnMap;
     }
-    
-    /**
+
+    private void pushHtStatus(Integer id) {
+		try {
+			BusinessContractReceive contractReceive = businessContractReceiveService.findbyParmaryKey(id);
+			if (null != contractReceive) {
+				//businessNoticeReceive.getHtbh(), businessNoticeReceive.getOrgId()
+				JSONObject object = new JSONObject();
+				object.put("htbh", contractReceive.getHtbh());
+				object.put("orgId", contractReceive.getOrgId());
+				receiveNoticeService.pushHtStatus(object.toString());
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+
+	/**
      * 获取审批列表.
      */
     public List<BusinessDeliveryStorageNoticeAuditVO> getApprovalList(Map<String, Object> paramMap) {

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

@@ -544,6 +544,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 			JSONObject object = new JSONObject();
 			object.put("htbm", htbm);
 			object.put("isChange", "0");
+			logger.info("给给市平台发送合同被引用通知数据串："+object.toString());;
 
 			//给市平台发送请求
 			result = HTTPUtils.doPost(path, object.toString());