设备维修流程补充位置

@@ -401,6 +401,7 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
         				handleSparepartInfoMap.put(warehouseId, temp);
         			}
         			temp.put("warehouseId", warehouseId);
+					temp.put("position", info.getPosition());
         			Object suppliesAndNumList = temp.get("suppliesAndNumList");
         			if(suppliesAndNumList==null) {
         				suppliesAndNumList = new ArrayList<SuppliesAndNumDTO>();
@@ -418,6 +419,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
     		Set<String> keySet = handleSparepartInfoMap.keySet();
     		for(String key : keySet) {
     			Map<String, Object> warhouseGroupMap = handleSparepartInfoMap.get(key);
+				// 1. 位置存入上下文
+				BaseContextHandler.set("EquipmentRepair_position", ConvertUtils.getString(warhouseGroupMap.get("position")));
     			//更新物料库存数量-入库仓库
     			String warehouseId = ConvertUtils.getString(warhouseGroupMap.get("warehouseId"));
     			List<SuppliesAndNumDTO> suppliesAndNumList = (List<SuppliesAndNumDTO>)warhouseGroupMap.get("suppliesAndNumList");

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.exception.JeecgBootException;
+import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.DateUtils;
 import com.skua.modules.equipment.dto.EquipmentAdjustQueryDTO;
 import com.skua.modules.equipment.dto.SuppliesAndNumDTO;
@@ -241,6 +242,9 @@ public class EquipmentSparepartSuppliesAdjustServiceImpl extends ServiceImpl<Equ
         if(CollectionUtils.isEmpty(suppliesAndNumList)){
             throw new JeecgBootException("出库：物料数量不能为空");
         }
+        // 2. 取出来之后置空，防止线程池复用时获取上一次的值
+        String position = ConvertUtils.getString(BaseContextHandler.get("EquipmentRepair_position"));
+        BaseContextHandler.set("EquipmentRepair_position", null);
         //生成出库单----------------------------------------------------------------------------------------------------
         EquipmentOut equipmentOutSaveParam = new EquipmentOut();
         equipmentOutSaveParam.setId(UniqIdUtils.getInstance().getUniqID());
@@ -266,6 +270,7 @@ public class EquipmentSparepartSuppliesAdjustServiceImpl extends ServiceImpl<Equ
             equipmentOutChildSaveParam.setOutId(equipmentOutSaveParam.getId());
             equipmentOutChildSaveParam.setSparepartId(suppliesId);
             equipmentOutChildSaveParam.setOutNum(num);
+            equipmentOutChildSaveParam.setUsePosition(position);
             equipmentOutChildService.save(equipmentOutChildSaveParam);
 
             //减少库存数量