根据开会内容修改

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.java

@@ -117,9 +117,6 @@ public interface BusinessDeliveryStorageNoticeMapper {
     List<BusinessDeliveryStorageNoticeAuditVO> selectByExampleToVO(
             BusinessDeliveryStorageNoticeExample example);
 
-    //统计出入库数据
-	List<BusinessDeliveryStorageNotice> countTj();
-
 	//根据通知单状态查询数据--主表
     List<Map<String,Object>> uploadNoticeData(Map<String,Object> map);
 
@@ -132,4 +129,9 @@ public interface BusinessDeliveryStorageNoticeMapper {
     List<BusinessDeliveryStorageNotice> selectByExampleDetails(Map<String,Object> map);
 
     String getCountQYzl(Map<String,Object> map);
+
+    /**
+     * @param paramMap
+     */
+    void uploadNoticeUnwind(Map<String, Object> paramMap);
 }

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

@@ -1212,7 +1212,7 @@
     left join business_plan plan on notice.plan_bid = plan.id
     left join basic_enum enum on  plan.execute_type = enum.enumId
     WHERE ((notice.audit_state=2) or (notice.bill_type=2)) and 1 = 1 <!-- 审批通过的,中转通知单没有审批 -->
-    AND notice.in_Application in (1,3,4)
+    AND notice.in_Application in (1,3,4,5)
     <if test="orgId != null" ><!--用house_id 区分是哪个库的 house_id是代储库 orgId 是主库 -->
       AND notice.house_id = #{orgId,jdbcType=INTEGER}
     </if>
@@ -1280,4 +1280,21 @@
       AND bill_type = #{billType}
     </if>
   </select>
+
+  <update id="uploadNoticeUnwind" parameterType="java.util.Map">
+    update business_delivery_storage_notice
+    set in_application = 5
+    where
+    1=1
+    <if test="orgId != null" ><!--用house_id 区分是哪个库的 house_id是代储库 orgId 是主库 -->
+      AND org_id = #{orgId,jdbcType=INTEGER}
+    </if>
+    AND in_application != 5<!-- 只修改不是已平仓的  -->
+    <if test="ids != null" >
+      AND id in
+      <foreach collection="ids" item="listItem" open="(" close=")" separator="," >
+        #{listItem}
+      </foreach>
+    </if>
+  </update>
 </mapper>

src/main/java/com/chinaitop/depot/pushs/service/PushsService.java

@@ -18,6 +18,8 @@ public interface PushsService {
 	
 	String receiveTzd(String orgId, String data);
 
+	String uploadNoticeUnwind(String orgId, String houseId);
+
 	//出入库将倒仓通知单记录传回库级平台进行展示
 	String updateChangeStorageHouse(String orgId, String applyNo, String foodStatus, String goalNumber);
 

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

@@ -525,4 +525,38 @@ public class PushServiceImpl implements PushsService{
 		    
 		return map.toString();
 	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public String uploadNoticeUnwind(String orgId, String houseId) {
+
+		//先根据仓房id从通知单子表查出来相关联的通知单id集合
+		BusinessStoreWareDetailExample businessStoreWareDetailExample = new BusinessStoreWareDetailExample();
+		BusinessStoreWareDetailExample.Criteria criteria = businessStoreWareDetailExample.createCriteria();
+		criteria.andHouseIdEqualTo(Integer.parseInt(houseId));
+		criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
+		criteria.andTypeEqualTo("notice");//默认查询通知单类型数据
+		List<BusinessStoreWareDetail> json = businessStoreWareDetailMapper.selectByExample(businessStoreWareDetailExample);
+
+		List<String> noticeIds = new ArrayList<>();
+		if (!ParameterUtil.isequal(0,json.size())) {
+			for (int i = 0; i < json.size(); i++) {
+				noticeIds.add(json.get(i).getZid().toString());
+			}
+
+			//查出数据
+			Map<String,Object> mapCondition = new HashMap<String, Object>();
+			if(ParameterUtil.isnotnull(noticeIds)){
+				mapCondition.put("ids",noticeIds);
+			}
+			if(ParameterUtil.isnotnull(orgId)){
+				mapCondition.put("orgId",orgId);
+			}
+			businessDeliveryStorageNoticeMapper.uploadNoticeUnwind(mapCondition);
+		}
+
+		Map<String,Object> mapData = new HashMap<String, Object>();
+		mapData.put("status", "success");
+		return JSON.toJSONString(ResponseEntity.ok(mapData));
+	}
 }

src/main/java/com/chinaitop/depot/unissoft/webservice/NoticePassService.java

@@ -30,4 +30,7 @@ public interface NoticePassService {
     //接收出入库下发的通知单
     public String uploadNoticeDatas(@WebParam(name = "org_id") String org_id,@WebParam(name = "data") String data);
 
+    //接收出入库下发的通知单
+    public String uploadNoticeUnwind(@WebParam(name = "orgId") String orgId,@WebParam(name = "houseId") String houseId);
+
 }

src/main/java/com/chinaitop/depot/unissoft/webservice/NoticePassServiceImpl.java

@@ -34,9 +34,13 @@ public class NoticePassServiceImpl implements NoticePassService{
 
 	@Override
 	public String uploadNoticeDatas(String org_id, String data) {
-		// TODO Auto-generated method stub
 		return PushsService.receiveTzd(org_id,data);
 	}
 
+	@Override
+	public String uploadNoticeUnwind(String orgId, String houseId) {
+		return PushsService.uploadNoticeUnwind(orgId,houseId);
+	}
+
 
 }