1

src/main/java/com/chinaitop/depot/basic/controller/BasicKeeperController.java

@@ -520,35 +520,30 @@ public class BasicKeeperController {
 			@ApiImplicitParam(name = "receiveId", value = "接收人ID", paramType = "form"),
 			@ApiImplicitParam(name = "transferId", value = "移交人ID", paramType = "form"),
 			@ApiImplicitParam(name = "roleId", value = "保管员ID", paramType = "form"),
+			@ApiImplicitParam(name = "orgId", value = "库ID", paramType = "form")
 	})
-	public Map<String, Object> updateKeeperHouse(Integer houseId, Integer receiveId,Integer transferId,Integer roleId){
+	public Map<String, Object> updateKeeperHouse(Integer houseId, Integer receiveId, Integer transferId, Integer roleId, Integer orgId){
 		Map<String,Object> modelMap = new HashMap<String,Object>();
-		/**保管员移交步骤
-		 * 更新移交人和接收人在仓房和保管员表中中的记录basic_keeper_house表
-		 */
+
 		try {
-			//更新移交人和接收人在仓房和保管员表中的记录basic_keeper_house表
-			//得到对应的保管员
-			BasicKeeper keeper=keeperService.findKeeperHouseByUserId(transferId,roleId);
 			//根据移交人的id和仓号删除在basic_keeper_house表中的记录
-			keeperHouseService.deleteByKeeperIdAndHouseId(keeper.getId(),houseId);
+			keeperHouseService.deleteByKeeperIdAndHouseId(transferId, houseId);
 
-			//获取接收人的id
-			Integer rId=keeperService.findKeeperHouseByUserId(receiveId,roleId).getId();
+			//按照接收人组装保管数据
 			BasicKeeperHouse keeperHouse = new BasicKeeperHouse();
 			keeperHouse.setHouseId(houseId);//移交的仓房
-			keeperHouse.setKeeperId(rId);//接收人的id
-			keeperHouse.setOrgId(keeper.getGrainId());//登录的人所在库点
-			keeperHouse.setCreateId(keeper.getId());//登录人（移交人）
+			keeperHouse.setKeeperId(receiveId);//接收人的id
+			keeperHouse.setOrgId(orgId);//登录的人所在库点
+			keeperHouse.setCreateId(transferId);//登录人（移交人）
 			keeperHouse.setCreateTime(new Date());
 
-			//如果移交人和接收人管理的有相同的仓号，
-			// 那么移交后会出现house_keeper_houer表的keeperId和houseId相同，就会出现报错，这里特殊处理
-			BasicKeeperHouse basicKeeperHouse=keeperHouseService.getHouseKeeperBykeeperIdAndHouseId(rId,houseId);
+			//如果移交人和接收人管理的有相同的仓，那就不新增了，
+			BasicKeeperHouse basicKeeperHouse=keeperHouseService.getHouseKeeperBykeeperIdAndHouseId(receiveId, houseId);
 			if(basicKeeperHouse == null){
 				//进行保存
 				keeperHouseService.save(keeperHouse);
 			}
+
 			modelMap.put("msg","success");
 		}catch (Exception ex){
 			modelMap.put("msg", "error");

src/main/java/com/chinaitop/depot/basic/service/BasicKeeperHouseService.java

@@ -20,6 +20,12 @@ public interface BasicKeeperHouseService {
 	void delete(BasicKeeperHouseExample example);
 
 	/**
+	 * 修改
+	 * @param keeperHouse
+	 */
+	void update(BasicKeeperHouse keeperHouse);
+
+	/**
 	 * 按条件查询
 	 * @param example
 	 * @return

src/main/java/com/chinaitop/depot/basic/service/impl/BasicKeeperHouseServiceImpl.java

@@ -65,4 +65,9 @@ public class BasicKeeperHouseServiceImpl implements BasicKeeperHouseService {
 		return keep_list;
 	}
 
+	@Override
+	public void update(BasicKeeperHouse keeperHouse) {
+		mapper.updateByPrimaryKey(keeperHouse);
+	}
+
 }