倒仓进度查询修改

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

@@ -70,7 +70,8 @@ public class PushServiceImpl implements PushsService{
 			StorageChangeStoragehouseDefaultExample StorageChangeStoragehouseDefaultExample = new StorageChangeStoragehouseDefaultExample();
 			Criteria Criteria = StorageChangeStoragehouseDefaultExample.createCriteria();
 			Criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
-			Criteria.andApplyNoEqualTo(applyNo);
+			//Criteria.andApplyNoEqualTo(applyNo);
+			Criteria.andChangehouseNoEqualTo(applyNo);
 			List<StorageChangeStoragehouseDefault> list = storageChangeStoragehouseDefaultMapper.selectByExample(StorageChangeStoragehouseDefaultExample);
 			if(list == null || list.size() ==0 ) {
 				retS = "该数据不存在!";
@@ -82,7 +83,7 @@ public class PushServiceImpl implements PushsService{
 				StorageChangeStoragehouseRop StorageChangeStoragehouseRop = new StorageChangeStoragehouseRop();
 				StorageChangeStoragehouseRop = new StorageChangeStoragehouseRop();
 				StorageChangeStoragehouseRop.setApplyFirm(o.getApplyFirm());   //申请倒仓企业
-				StorageChangeStoragehouseRop.setChangehouseNo(o.getChangehouseNo());  //倒仓通知单编号
+				StorageChangeStoragehouseRop.setChangehouseNo(applyNo);  //倒仓通知单编号
 				StorageChangeStoragehouseRop.setApplyTime(o.getApplyTime());   //申请日期
 				StorageChangeStoragehouseRop.setOutStorehouse(o.getOutStorehouse());  //倒出仓房
 				StorageChangeStoragehouseRop.setOutStorehouseName(o.getOutStorehouseName());   //倒出仓房名称
@@ -103,12 +104,12 @@ public class PushServiceImpl implements PushsService{
 				StorageChangeStoragehouseRop.setGoalNumber(o.getFoodNumber());   //目标数量
 				StorageChangeStoragehouseRop.setOutAfter(o.getOutAfter());  //倒出后保管方式
 				StorageChangeStoragehouseRop.setOrgId(Integer.parseInt(orgId));   //单位ID
-				StorageChangeStoragehouseRop.setApplyNo(applyNo);  //申请单号
+				StorageChangeStoragehouseRop.setApplyNo(o.getApplyNo());  //申请单号
 
 				StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
 				StorageChangeStoragehouseRopExample.Criteria criteria = StorageChangeStoragehouseRopExample.createCriteria();
 				criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
-				criteria.andApplyNoEqualTo(applyNo);
+				criteria.andChangehouseNoEqualTo(applyNo);
 				List<StorageChangeStoragehouseRop> ropList = storageChangeStoragehouseRopMapper.selectByExample(StorageChangeStoragehouseRopExample);
 				if(ropList == null || ropList.size() ==0 ){
 					storageChangeStoragehouseRopMapper.insertSelective(StorageChangeStoragehouseRop);
@@ -120,6 +121,7 @@ public class PushServiceImpl implements PushsService{
 		} catch (Exception e) {
 			retS = "系统异常，请联系管理员";
 			systemOutsideDataService.addlogger("dcjdsjjs", sbf.toString(), retS);
+			e.printStackTrace();
 		}
 		return retS;
 	}

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.xml

@@ -468,6 +468,6 @@
         out_after = #{outAfter,jdbcType=VARCHAR},
       </if>
     </set>
-    where apply_no = #{applyNo,jdbcType=VARCHAR}
+    where changehouse_no = #{changehouseNo,jdbcType=VARCHAR}
   </update>
 </mapper>